summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc109
-rw-r--r--meta/conf/distro/poky.conf11
-rw-r--r--meta/packages/xcalibrate/xcalibrate/xextproto.patch11
-rw-r--r--meta/packages/xcalibrate/xcalibrate_20060312.bb17
-rw-r--r--meta/packages/xcalibrate/xcalibrate_cvs.bb5
-rw-r--r--meta/packages/xorg-app/xauth/autofoo.patch (renamed from meta/packages/xauth/xauth/autofoo.patch)0
-rw-r--r--meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb6
-rw-r--r--meta/packages/xorg-app/xauth_cvs.bb (renamed from meta/packages/xauth/xauth_cvs.bb)2
-rw-r--r--meta/packages/xorg-app/xdpyinfo/disable-xkb.patch18
-rw-r--r--meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb10
-rw-r--r--meta/packages/xorg-app/xdpyinfo_cvs.bb (renamed from meta/packages/xdpyinfo/xdpyinfo_cvs.bb)2
-rw-r--r--meta/packages/xorg-app/xhost/autofoo.patch (renamed from meta/packages/xhost/xhost/autofoo.patch)0
-rw-r--r--meta/packages/xorg-app/xhost_20040413.bb (renamed from meta/packages/xhost/xhost_20040413.bb)2
-rw-r--r--meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-app/xmodmap/autofoo.patch (renamed from meta/packages/xmodmap/xmodmap/autofoo.patch)0
-rw-r--r--meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-app/xmodmap_cvs.bb (renamed from meta/packages/xmodmap/xmodmap_cvs.bb)2
-rw-r--r--meta/packages/xorg-app/xorg-app-common.inc18
-rw-r--r--meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb7
-rw-r--r--meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb7
-rw-r--r--meta/packages/xorg-app/xrandr_cvs.bb (renamed from meta/packages/xrandr/xrandr_cvs.bb)2
-rw-r--r--meta/packages/xorg-app/xrdb/autofoo.patch (renamed from meta/packages/xrdb/xrdb/autofoo.patch)0
-rw-r--r--meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb7
-rw-r--r--meta/packages/xorg-app/xrdb_cvs.bb (renamed from meta/packages/xrdb/xrdb_cvs.bb)2
-rw-r--r--meta/packages/xorg-app/xset/autofoo.patch (renamed from meta/packages/xset/xset/autofoo.patch)0
-rw-r--r--meta/packages/xorg-app/xset/disable-xkb.patch (renamed from meta/packages/xset/xset/disable-xkb.patch)0
-rw-r--r--meta/packages/xorg-app/xset_20040817.bb (renamed from meta/packages/xset/xset_20040817.bb)2
-rw-r--r--meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb13
-rw-r--r--meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb13
-rw-r--r--meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff528
-rw-r--r--meta/packages/xorg-lib/diet-x11/autofoo.patch (renamed from meta/packages/xlibs/libx11/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff14
-rw-r--r--meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch16
-rw-r--r--meta/packages/xorg-lib/diet-x11/xim.patch55
-rw-r--r--meta/packages/xorg-lib/diet-x11_20050226.bb (renamed from meta/packages/xlibs/diet-x11_6.2.1.bb)6
-rw-r--r--meta/packages/xorg-lib/diet-x11_6.2.1.bb9
-rw-r--r--meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb13
-rw-r--r--meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb9
-rw-r--r--meta/packages/xorg-lib/diet-x11_cvs.bb7
-rw-r--r--meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch (renamed from meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch)0
-rw-r--r--meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch (renamed from meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch)0
-rw-r--r--meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb5
-rw-r--r--meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb5
-rw-r--r--meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb12
-rw-r--r--meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb12
-rw-r--r--meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb8
-rw-r--r--meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libice/autofoo.patch (renamed from meta/packages/xlibs/libice/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libice_6.3.3.bb (renamed from meta/packages/xlibs/libice_6.3.3.bb)2
-rw-r--r--meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libice_cvs.bb17
-rw-r--r--meta/packages/xorg-lib/liblbxutil/mkg3states.patch51
-rw-r--r--meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb6
-rw-r--r--meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb6
-rw-r--r--meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libsm/autofoo.patch (renamed from meta/packages/xlibs/libsm/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libsm_6.0.3.bb (renamed from meta/packages/xlibs/libsm_6.0.3.bb)2
-rw-r--r--meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb9
-rw-r--r--meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb9
-rw-r--r--meta/packages/xorg-lib/libsm_cvs.bb18
-rw-r--r--meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libx11-native_6.2.1.bb (renamed from meta/packages/xlibs/libx11-native_6.2.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb25
-rw-r--r--meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb25
-rw-r--r--meta/packages/xorg-lib/libx11-native_cvs.bb5
-rw-r--r--meta/packages/xorg-lib/libx11/autofoo.patch22
-rw-r--r--meta/packages/xorg-lib/libx11_20050226.bb6
-rw-r--r--meta/packages/xorg-lib/libx11_6.2.1.bb (renamed from meta/packages/xlibs/libx11_6.2.1.bb)3
-rw-r--r--meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb22
-rw-r--r--meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb22
-rw-r--r--meta/packages/xorg-lib/libx11_cvs.bb42
-rw-r--r--meta/packages/xorg-lib/libx11_git.bb33
-rw-r--r--meta/packages/xorg-lib/libxau-native_0.1.1.bb (renamed from meta/packages/xlibs/libxau-native_0.1.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb11
-rw-r--r--meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb11
-rw-r--r--meta/packages/xorg-lib/libxau-native_cvs.bb (renamed from meta/packages/xlibs/libxau-native_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxau/autofoo.patch (renamed from meta/packages/xlibs/libxau/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxau_0.1.1.bb (renamed from meta/packages/xlibs/libxau_0.1.1.bb)0
-rw-r--r--meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libxau_cvs.bb (renamed from meta/packages/xlibs/libxau_cvs.bb)0
-rw-r--r--meta/packages/xorg-lib/libxaw/auxdir.patch10
-rw-r--r--meta/packages/xorg-lib/libxaw_7.0.2.bb21
-rw-r--r--meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb15
-rw-r--r--meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb15
-rw-r--r--meta/packages/xorg-lib/libxaw_cvs.bb19
-rw-r--r--meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch (renamed from meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxcomposite/change-include-order.patch14
-rw-r--r--meta/packages/xorg-lib/libxcomposite_1.0.1.bb (renamed from meta/packages/xlibs/libxcomposite_1.0.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb11
-rw-r--r--meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb11
-rw-r--r--meta/packages/xorg-lib/libxcomposite_cvs.bb (renamed from meta/packages/xlibs/libxcomposite_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch (renamed from meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxcursor/autofoo.patch (renamed from meta/packages/xlibs/libxcursor/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxcursor_1.1.2.bb (renamed from meta/packages/xlibs/libxcursor_1.1.2.bb)0
-rw-r--r--meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb10
-rw-r--r--meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb10
-rw-r--r--meta/packages/xorg-lib/libxcursor_cvs.bb17
-rw-r--r--meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch (renamed from meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxdamage/m4.patch (renamed from meta/packages/xlibs/libxdamage/m4.patch)0
-rw-r--r--meta/packages/xorg-lib/libxdamage_1.0.1.bb (renamed from meta/packages/xlibs/libxdamage_1.0.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb10
-rw-r--r--meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb10
-rw-r--r--meta/packages/xorg-lib/libxdamage_cvs.bb (renamed from meta/packages/xlibs/libxdamage_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb5
-rw-r--r--meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb (renamed from meta/packages/xlibs/libxdmcp-native_0.1.3.bb)2
-rw-r--r--meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb11
-rw-r--r--meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb11
-rw-r--r--meta/packages/xorg-lib/libxdmcp/autofoo.patch (renamed from meta/packages/xlibs/libxdmcp/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxdmcp_0.1.1.bb18
-rw-r--r--meta/packages/xorg-lib/libxdmcp_0.1.3.bb (renamed from meta/packages/xlibs/libxdmcp_0.1.3.bb)0
-rw-r--r--meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libxdmcp_cvs.bb18
-rw-r--r--meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxext-native_cvs.bb (renamed from meta/packages/xlibs/libxext-native_cvs.bb)4
-rw-r--r--meta/packages/xorg-lib/libxext/autofoo.patch (renamed from meta/packages/xlibs/libxext/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libxext_cvs.bb (renamed from meta/packages/xlibs/libxext_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxfixes/autofoo.patch (renamed from meta/packages/xlibs/libxfixes/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxfixes_2.0.1.bb (renamed from meta/packages/xlibs/libxfixes_2.0.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb9
-rw-r--r--meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb9
-rw-r--r--meta/packages/xorg-lib/libxfixes_cvs.bb (renamed from meta/packages/xlibs/libxfixes_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb13
-rw-r--r--meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb13
-rw-r--r--meta/packages/xorg-lib/libxfont/autofoo.patch (renamed from meta/packages/xlibs/libxfont/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxfont/no-scalable-crash.patch22
-rw-r--r--meta/packages/xorg-lib/libxfont/scalable.patch (renamed from meta/packages/xlibs/libxfont/scalable.patch)0
-rw-r--r--meta/packages/xorg-lib/libxfont_1.4.2.bb (renamed from meta/packages/xlibs/libxfont_1.4.2.bb)0
-rw-r--r--meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb15
-rw-r--r--meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb11
-rw-r--r--meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb17
-rw-r--r--meta/packages/xorg-lib/libxfont_cvs.bb (renamed from meta/packages/xlibs/libxfont_cvs.bb)0
-rw-r--r--meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb8
-rw-r--r--meta/packages/xorg-lib/libxft/autofoo.patch (renamed from meta/packages/xlibs/libxft/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxft_2.1.6.bb (renamed from meta/packages/xlibs/libxft_2.1.6.bb)2
-rw-r--r--meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb19
-rw-r--r--meta/packages/xorg-lib/libxft_cvs.bb (renamed from meta/packages/xlibs/libxft_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxi/autofoo.patch (renamed from meta/packages/xlibs/libxi/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxi_6.0.1.bb (renamed from meta/packages/xlibs/libxi_6.0.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxi_cvs.bb16
-rw-r--r--meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb16
-rw-r--r--meta/packages/xorg-lib/libxinerama_1.0.2.bb17
-rw-r--r--meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libxinerama_cvs.bb16
-rw-r--r--meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb8
-rw-r--r--meta/packages/xorg-lib/libxkbfile_cvs.bb15
-rw-r--r--meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb8
-rw-r--r--meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb16
-rw-r--r--meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb16
-rw-r--r--meta/packages/xorg-lib/libxmu_cvs.bb (renamed from meta/packages/xlibs/libxmu_cvs.bb)0
-rw-r--r--meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-lib/libxp_cvs.bb18
-rw-r--r--meta/packages/xorg-lib/libxpm/autofoo.patch (renamed from meta/packages/xlibs/libxpm/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxpm_3.5.1.bb (renamed from meta/packages/xlibs/libxpm_3.5.1.bb)2
-rw-r--r--meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb13
-rw-r--r--meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb13
-rw-r--r--meta/packages/xorg-lib/libxpm_cvs.bb (renamed from meta/packages/xlibs/libxpm_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch (renamed from meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxrandr/autofoo.patch (renamed from meta/packages/xlibs/libxrandr/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxrandr_1.0.2.bb (renamed from meta/packages/xlibs/libxrandr_1.0.2.bb)2
-rw-r--r--meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb9
-rw-r--r--meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb9
-rw-r--r--meta/packages/xorg-lib/libxrandr_cvs.bb15
-rw-r--r--meta/packages/xorg-lib/libxrender/autofoo.patch (renamed from meta/packages/xlibs/libxrender/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxrender_0.8.4.bb15
-rw-r--r--meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb9
-rw-r--r--meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb9
-rw-r--r--meta/packages/xorg-lib/libxrender_cvs.bb (renamed from meta/packages/xlibs/libxrender_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxres_1.0.1.bb14
-rw-r--r--meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxres_cvs.bb15
-rw-r--r--meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb13
-rw-r--r--meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb13
-rw-r--r--meta/packages/xorg-lib/libxss_cvs.bb19
-rw-r--r--meta/packages/xorg-lib/libxt/autofoo.patch (renamed from meta/packages/xlibs/libxt/autofoo.patch)0
-rw-r--r--meta/packages/xorg-lib/libxt_0.1.5.bb (renamed from meta/packages/xlibs/libxt_0.1.5.bb)2
-rw-r--r--meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb19
-rw-r--r--meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb19
-rw-r--r--meta/packages/xorg-lib/libxt_cvs.bb26
-rw-r--r--meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb10
-rw-r--r--meta/packages/xorg-lib/libxtst_cvs.bb (renamed from meta/packages/xlibs/libxtst_cvs.bb)2
-rw-r--r--meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb13
-rw-r--r--meta/packages/xorg-lib/libxv_2.2.2.bb13
-rw-r--r--meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb9
-rw-r--r--meta/packages/xorg-lib/libxvmc/drm.patch9
-rw-r--r--meta/packages/xorg-lib/libxvmc/true.patch11
-rw-r--r--meta/packages/xorg-lib/libxvmc/via.patch23
-rw-r--r--meta/packages/xorg-lib/libxvmc_20040919.bb39
-rw-r--r--meta/packages/xorg-lib/libxvmc_20041025.bb36
-rw-r--r--meta/packages/xorg-lib/libxvmc_20050612.bb37
-rw-r--r--meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb8
-rw-r--r--meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxxf86dga_cvs.bb15
-rw-r--r--meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb9
-rw-r--r--meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb9
-rw-r--r--meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb8
-rw-r--r--meta/packages/xorg-lib/libxxf86vm_cvs.bb15
-rw-r--r--meta/packages/xorg-lib/xorg-lib-common.inc17
-rw-r--r--meta/packages/xorg-lib/xtrans-native_0.1.bb (renamed from meta/packages/xlibs/xtrans-native_0.1.bb)2
-rw-r--r--meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb11
-rw-r--r--meta/packages/xorg-lib/xtrans_0.1.bb (renamed from meta/packages/xlibs/xtrans_0.1.bb)0
-rw-r--r--meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb8
-rw-r--r--meta/packages/xorg-lib/xtrans_cvs.bb (renamed from meta/packages/xlibs/xtrans_cvs.bb)0
-rw-r--r--meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb6
-rw-r--r--meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb9
-rw-r--r--meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb6
-rw-r--r--meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb7
-rw-r--r--meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb7
-rw-r--r--meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb7
-rw-r--r--meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb5
-rw-r--r--meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb5
-rw-r--r--meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb7
-rw-r--r--meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb7
-rw-r--r--meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb9
-rw-r--r--meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb5
-rw-r--r--meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb9
-rw-r--r--meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb5
-rw-r--r--meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb5
-rw-r--r--meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb5
-rw-r--r--meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb9
-rw-r--r--meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb5
-rw-r--r--meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb9
-rw-r--r--meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb5
-rw-r--r--meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb8
-rw-r--r--meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb5
-rw-r--r--meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb7
-rw-r--r--meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb7
-rw-r--r--meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb7
-rw-r--r--meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb7
-rw-r--r--meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb5
-rw-r--r--meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb5
-rw-r--r--meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb5
-rw-r--r--meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb5
-rw-r--r--meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb5
-rw-r--r--meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb9
-rw-r--r--meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb5
-rw-r--r--meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb11
-rw-r--r--meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb7
-rw-r--r--meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb9
-rw-r--r--meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb5
-rw-r--r--meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb7
-rw-r--r--meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb5
-rw-r--r--meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb5
-rw-r--r--meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb5
-rw-r--r--meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb7
-rw-r--r--meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb5
-rw-r--r--meta/packages/xorg-proto/xorg-proto-common.inc16
-rw-r--r--meta/packages/xorg-proto/xproto-native_6.6.2.bb (renamed from meta/packages/xproto/xproto-native_6.6.2.bb)2
-rw-r--r--meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb9
-rw-r--r--meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb9
-rw-r--r--meta/packages/xorg-proto/xproto-native_cvs.bb (renamed from meta/packages/xproto/xproto-native_cvs.bb)2
-rw-r--r--meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb (renamed from meta/packages/xproto/xproto_6.6.2+cvs20050226.bb)0
-rw-r--r--meta/packages/xorg-proto/xproto_6.6.2.bb (renamed from meta/packages/xproto/xproto_6.6.2.bb)0
-rw-r--r--meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb5
-rw-r--r--meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb5
-rw-r--r--meta/packages/xorg-proto/xproto_cvs.bb (renamed from meta/packages/xproto/xproto_cvs.bb)0
-rw-r--r--meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb6
-rw-r--r--meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb6
-rw-r--r--meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb6
-rw-r--r--meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb10
-rw-r--r--meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb6
-rw-r--r--meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb10
-rw-r--r--meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb10
-rw-r--r--meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb6
-rw-r--r--meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb7
-rw-r--r--meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb7
-rw-r--r--meta/packages/xorg-util/xorg-util-common.inc15
-rw-r--r--meta/packages/xorg-xserver/xorg-xserver-common.inc43
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch (renamed from meta/packages/xserver/xserver-kdrive-omap/configure-tslib.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch (renamed from meta/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch (renamed from meta/packages/xserver/xserver-kdrive-omap/kmode.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb (renamed from meta/packages/xserver/xserver-kdrive-omap_6.6.3.bb)7
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff (renamed from meta/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/devfs.patch (renamed from meta/packages/xserver/xserver-kdrive/devfs.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch (renamed from meta/packages/xserver/xserver-kdrive/disable-apm.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch37
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch12
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch23
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/epson.patch (renamed from meta/packages/xserver/xserver-kdrive/epson.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch (renamed from meta/packages/xserver/xserver-kdrive/faster-rotated.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch (renamed from meta/packages/xserver/xserver-kdrive/fbdev-not-fix.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch (renamed from meta/packages/xserver/xserver-kdrive/kdrive-evdev.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch (renamed from meta/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/kmode.patch (renamed from meta/packages/xserver/xserver-kdrive/kmode.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch (renamed from meta/packages/xserver/xserver-kdrive/no-serial-probing.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/onlyfb.patch (renamed from meta/packages/xserver/xserver-kdrive/onlyfb.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch54
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch351
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch (renamed from meta/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20050207.bb (renamed from meta/packages/xserver/xserver-kdrive_20050207.bb)6
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20050624.bb (renamed from meta/packages/xserver/xserver-kdrive_20050624.bb)2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20060312.bb (renamed from meta/packages/xserver/xserver-kdrive_20060312.bb)2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb46
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_cvs.bb (renamed from meta/packages/xserver/xserver-kdrive_cvs.bb)8
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_git.bb48
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/dri.patch (renamed from meta/packages/xserver/xserver-xorg/dri.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/drmfix.patch13
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/fontfile.patch (renamed from meta/packages/xserver/xserver-xorg/fontfile.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/freetype.patch (renamed from meta/packages/xserver/xserver-xorg/freetype.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch (renamed from meta/packages/xserver/xserver-xorg/imake-installed.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch (renamed from meta/packages/xserver/xserver-xorg/imake-staging.patch)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch11
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/xorg.conf149
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch30
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb (renamed from meta/packages/xserver/xserver-xorg_6.8.99.10.bb)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb (renamed from meta/packages/xserver/xserver-xorg_6.8.99.11.bb)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb9
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb9
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_cvs.bb (renamed from meta/packages/xserver/xserver-xorg_cvs.bb)0
335 files changed, 3953 insertions, 60 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 0000000000..1a28a3f3b4
--- /dev/null
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,109 @@
1PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
2PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
3PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
4PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
5PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
6PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
7PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
8PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
9PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
10PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
11PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
12PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
13PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
14PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
15PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
16PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
17PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
18PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
19PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
20PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
21PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
22PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
23PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
24PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
25PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
26PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
27PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
28PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
29PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
30PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
31PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
32PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
33PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
34PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
35PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
36PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
37PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
38PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
39PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
40PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
41PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
42PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
43PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
44PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0"
45PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
46PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
47PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
48PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
49PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
50PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
51PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
52PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
53PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
54PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
55PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
56PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
57PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
58PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
59PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
60PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
61PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
62PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
63PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
64PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
65PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
66PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
67PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
68PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
69PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
70PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
71PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0"
72PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
73PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
74PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
75PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
76PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
77PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
78PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
79PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2"
80PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
81PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
82PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
83PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
84PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
85PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
86PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
87PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
88PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
89PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
90PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
91PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
92PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
93PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
94PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
95PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
96PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
97PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
98PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
99PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
100PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
101PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
102PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
103PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
104PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
105PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
106PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
107PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
108PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
109PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a08abf134c..561effbe29 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101"
103SRCDATE_xmodmap ?= "20051101" 103SRCDATE_xmodmap ?= "20051101"
104SRCDATE_libxrandr ?= "20051101" 104SRCDATE_libxrandr ?= "20051101"
105SRCDATE_libxtst ?= "20051101" 105SRCDATE_libxtst ?= "20051101"
106SRCDATE_xcalibrate ?= "20051101" 106SRCDATE_xcalibrate ?= "20060312"
107SRCDATE_libxmu ?= "20051115" 107SRCDATE_libxmu ?= "20051115"
108SRCDATE_xdpyinfo ?= "20051115" 108SRCDATE_xdpyinfo ?= "20051115"
109SRCDATE_xauth ?= "20060120" 109SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
127PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}" 127PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
128PREFERRED_VERSION_matchbox-wm ?= "1.1" 128PREFERRED_VERSION_matchbox-wm ?= "1.1"
129PREFERRED_VERSION_libmatchbox ?= "1.9" 129PREFERRED_VERSION_libmatchbox ?= "1.9"
130PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
131 130
132PREFERRED_VERSION_glib-2.0 ?= "2.10.3" 131PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
133PREFERRED_VERSION_glib-2.0-native ?= "2.10.3" 132PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
140PREFERRED_VERSION_dbus ?= "0.60" 139PREFERRED_VERSION_dbus ?= "0.60"
141PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" 140PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
142 141
143PREFERRED_VERSION_diet-x11 ?= "6.2.1"
144PREFERRED_VERSION_dillo2 ?= "0.6.6" 142PREFERRED_VERSION_dillo2 ?= "0.6.6"
145PREFERRED_VERSION_evince ?= "0.3.2" 143PREFERRED_VERSION_evince ?= "0.3.2"
146PREFERRED_VERSION_firefox ?= "1.0" 144PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
161PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" 159PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
162PREFERRED_VERSION_xdemineur ?= "2.1.1" 160PREFERRED_VERSION_xdemineur ?= "2.1.1"
163PREFERRED_VERSION_xextensions ?= "1.0.1" 161PREFERRED_VERSION_xextensions ?= "1.0.1"
164PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" 162
163
165PREFERRED_VERSION_xmonobut ?= "0.4" 164PREFERRED_VERSION_xmonobut ?= "0.4"
166PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 165PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
167PREFERRED_VERSION_xproto ?= "6.6.2"
168PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
169PREFERRED_VERSION_xst ?= "0.15" 166PREFERRED_VERSION_xst ?= "0.15"
170PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}" 167PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
171 168
169require conf/distro/include/preferred-xorg-versions.inc
170
172PCMCIA_MANAGER ?= "pcmciautils" 171PCMCIA_MANAGER ?= "pcmciautils"
173 172
174CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" 173CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
diff --git a/meta/packages/xcalibrate/xcalibrate/xextproto.patch b/meta/packages/xcalibrate/xcalibrate/xextproto.patch
new file mode 100644
index 0000000000..cb190c073b
--- /dev/null
+++ b/meta/packages/xcalibrate/xcalibrate/xextproto.patch
@@ -0,0 +1,11 @@
1--- XCalibrate/configure.ac.orig 2006-03-08 14:57:07.000000000 +0100
2+++ XCalibrate/configure.ac 2006-03-08 14:57:14.000000000 +0100
3@@ -7,7 +7,7 @@
4 AC_PROG_LIBTOOL
5
6 # Check for X
7-PKG_CHECK_MODULES(XCALIBRATE, x11 xextensions xcalibrateext)
8+PKG_CHECK_MODULES(XCALIBRATE, x11 xextproto xcalibrateext)
9
10 AC_OUTPUT([Makefile
11 xcalibrate.pc])
diff --git a/meta/packages/xcalibrate/xcalibrate_20060312.bb b/meta/packages/xcalibrate/xcalibrate_20060312.bb
new file mode 100644
index 0000000000..1de87c04eb
--- /dev/null
+++ b/meta/packages/xcalibrate/xcalibrate_20060312.bb
@@ -0,0 +1,17 @@
1PV = "0.0+cvs${FIXEDSRCDATE}"
2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3LICENSE = "BSD-X"
4SECTION = "x11/libs"
5PRIORITY = "optional"
6DEPENDS = "virtual/libx11 xcalibrateext libxext"
7DESCRIPTION = "XCalibrate client-side library"
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
10 file://xextproto.patch;patch=1"
11S = "${WORKDIR}/XCalibrate"
12
13inherit autotools pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
diff --git a/meta/packages/xcalibrate/xcalibrate_cvs.bb b/meta/packages/xcalibrate/xcalibrate_cvs.bb
index ab2b076079..a5b435795a 100644
--- a/meta/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/meta/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,10 +2,11 @@ PV = "0.0+cvs${SRCDATE}"
2LICENSE = "BSD-X" 2LICENSE = "BSD-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5DEPENDS = "libx11 xcalibrateext libxext" 5DEPENDS = "virtual/libx11 xcalibrateext libxext"
6DESCRIPTION = "XCalibrate client-side library" 6DESCRIPTION = "XCalibrate client-side library"
7 7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate" 8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
9 file://xextproto.patch;patch=1"
9S = "${WORKDIR}/XCalibrate" 10S = "${WORKDIR}/XCalibrate"
10 11
11inherit autotools pkgconfig 12inherit autotools pkgconfig
diff --git a/meta/packages/xauth/xauth/autofoo.patch b/meta/packages/xorg-app/xauth/autofoo.patch
index d279a6f4fc..d279a6f4fc 100644
--- a/meta/packages/xauth/xauth/autofoo.patch
+++ b/meta/packages/xorg-app/xauth/autofoo.patch
diff --git a/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b891ff90ef
--- /dev/null
+++ b/meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-app-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxau libxext libxmu"
6
diff --git a/meta/packages/xauth/xauth_cvs.bb b/meta/packages/xorg-app/xauth_cvs.bb
index 54700574b7..a944d1d51d 100644
--- a/meta/packages/xauth/xauth_cvs.bb
+++ b/meta/packages/xorg-app/xauth_cvs.bb
@@ -1,6 +1,6 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "libx11 libxau libxmu libxext" 3DEPENDS = "virtual/libx11 libxau libxmu libxext"
4DESCRIPTION = "X authority file utility" 4DESCRIPTION = "X authority file utility"
5MAINTAINER = "Rene Wagner <rw@handhelds.org>" 5MAINTAINER = "Rene Wagner <rw@handhelds.org>"
6SECTION = "x11/base" 6SECTION = "x11/base"
diff --git a/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch
new file mode 100644
index 0000000000..24af21f4fc
--- /dev/null
+++ b/meta/packages/xorg-app/xdpyinfo/disable-xkb.patch
@@ -0,0 +1,18 @@
1--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100
2+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100
3@@ -45,11 +45,15 @@
4 AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
5 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
6
7+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
8+ XKB="$enableval", XKB="yes")
9+if test "x$XKB" = "xyes" ; then
10 PKG_CHECK_MODULES(DPY_XKB, x11,
11 [SAVE_CPPFLAGS="$CPPFLAGS"
12 CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
13 AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
14 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
15+fi
16
17 PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
18 [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..d212bc1422
--- /dev/null
+++ b/meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X display information utility"
4LICENSE = "MIT"
5
6DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
7
8SRC_URI += "file://disable-xkb.patch;patch=1"
9
10EXTRA_OECONF = "--disable-xkb"
diff --git a/meta/packages/xdpyinfo/xdpyinfo_cvs.bb b/meta/packages/xorg-app/xdpyinfo_cvs.bb
index eb63ae7f4d..df31ba68d5 100644
--- a/meta/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/meta/packages/xorg-app/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "libx11 libxext libxtst" 3DEPENDS = "virtual/libx11 libxext libxtst"
4DESCRIPTION = "X display information utility" 4DESCRIPTION = "X display information utility"
5MAINTAINER = "Phil Blundell <pb@handhelds.org>" 5MAINTAINER = "Phil Blundell <pb@handhelds.org>"
6SECTION = "x11/base" 6SECTION = "x11/base"
diff --git a/meta/packages/xhost/xhost/autofoo.patch b/meta/packages/xorg-app/xhost/autofoo.patch
index b29f017abc..b29f017abc 100644
--- a/meta/packages/xhost/xhost/autofoo.patch
+++ b/meta/packages/xorg-app/xhost/autofoo.patch
diff --git a/meta/packages/xhost/xhost_20040413.bb b/meta/packages/xorg-app/xhost_20040413.bb
index 4d36e62bee..ed240dbba1 100644
--- a/meta/packages/xhost/xhost_20040413.bb
+++ b/meta/packages/xorg-app/xhost_20040413.bb
@@ -1,7 +1,7 @@
1FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" 1FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
2LICENSE = "MIT" 2LICENSE = "MIT"
3PV = "0.0+cvs${FIXEDSRCDATE}" 3PV = "0.0+cvs${FIXEDSRCDATE}"
4DEPENDS = "libx11 libxext libxmu" 4DEPENDS = "virtual/libx11 libxext libxmu"
5DESCRIPTION = "server access control program for X" 5DESCRIPTION = "server access control program for X"
6MAINTAINER = "Rene Wagner <rw@handhelds.org>" 6MAINTAINER = "Rene Wagner <rw@handhelds.org>"
7SECTION = "x11/base" 7SECTION = "x11/base"
diff --git a/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a08ad7184d
--- /dev/null
+++ b/meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "Server access control program for X"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "MIT"
6
7DEPENDS += " virtual/libx11 libxmu libxau"
8
diff --git a/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..a08ad7184d
--- /dev/null
+++ b/meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "Server access control program for X"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "MIT"
6
7DEPENDS += " virtual/libx11 libxmu libxau"
8
diff --git a/meta/packages/xmodmap/xmodmap/autofoo.patch b/meta/packages/xorg-app/xmodmap/autofoo.patch
index f309add086..f309add086 100644
--- a/meta/packages/xmodmap/xmodmap/autofoo.patch
+++ b/meta/packages/xorg-app/xmodmap/autofoo.patch
diff --git a/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b671beb07b
--- /dev/null
+++ b/meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "MIT"
6
7DEPENDS += " virtual/libx11"
8
diff --git a/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..4fe4c0c4cc
--- /dev/null
+++ b/meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "MIT"
6
7DEPENDS += " virtual/libx11"
8
diff --git a/meta/packages/xmodmap/xmodmap_cvs.bb b/meta/packages/xorg-app/xmodmap_cvs.bb
index 773466e6bb..7f45b28a89 100644
--- a/meta/packages/xmodmap/xmodmap_cvs.bb
+++ b/meta/packages/xorg-app/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5SECTION = "x11/base" 5SECTION = "x11/base"
6PR = "r1" 6PR = "r1"
7 7
8DEPENDS = "libx11" 8DEPENDS = "virtual/libx11"
9 9
10SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ 10SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
11 file://autofoo.patch;patch=1" 11 file://autofoo.patch;patch=1"
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
new file mode 100644
index 0000000000..78146b1e78
--- /dev/null
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -0,0 +1,18 @@
1DESCRIPTION = "X application"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/apps"
4#MAINTAINER = ""
5LICENSE = "MIT-X"
6
7#DEPENDS = ""
8XORG_PN = "${PN}"
9SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
10S = "${WORKDIR}/${XORG_PN}-${PV}"
11
12FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
13
14inherit autotools pkgconfig
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..4b878cc32e
--- /dev/null
+++ b/meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Resize and Rotate extension command."
4LICENSE= "BSD-X"
5
6DEPENDS += " libxrandr libxrender virtual/libx11"
7
diff --git a/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..4b878cc32e
--- /dev/null
+++ b/meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Resize and Rotate extension command."
4LICENSE= "BSD-X"
5
6DEPENDS += " libxrandr libxrender virtual/libx11"
7
diff --git a/meta/packages/xrandr/xrandr_cvs.bb b/meta/packages/xorg-app/xrandr_cvs.bb
index 0ab7c745f4..30a31e1569 100644
--- a/meta/packages/xrandr/xrandr_cvs.bb
+++ b/meta/packages/xorg-app/xrandr_cvs.bb
@@ -1,6 +1,6 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3DEPENDS = "libxrandr libx11 libxext" 3DEPENDS = "libxrandr virtual/libx11 libxext"
4DESCRIPTION = "X Resize and Rotate extension command." 4DESCRIPTION = "X Resize and Rotate extension command."
5SECTION = "x11/base" 5SECTION = "x11/base"
6 6
diff --git a/meta/packages/xrdb/xrdb/autofoo.patch b/meta/packages/xorg-app/xrdb/autofoo.patch
index b30a46bc36..b30a46bc36 100644
--- a/meta/packages/xrdb/xrdb/autofoo.patch
+++ b/meta/packages/xorg-app/xrdb/autofoo.patch
diff --git a/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bad78d3873
--- /dev/null
+++ b/meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X server resource database utility"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "xrdb"
6
7DEPENDS += " libxmu virtual/libx11 libxext"
8
diff --git a/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..d73890cc15
--- /dev/null
+++ b/meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X server resource database utility"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5LICENSE = "xrdb"
6
7DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/meta/packages/xrdb/xrdb_cvs.bb b/meta/packages/xorg-app/xrdb_cvs.bb
index cbf2caac70..51a3fcd08a 100644
--- a/meta/packages/xrdb/xrdb_cvs.bb
+++ b/meta/packages/xorg-app/xrdb_cvs.bb
@@ -1,5 +1,5 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2DEPENDS = "libx11 libxmu libxext" 2DEPENDS = "virtual/libx11 libxmu libxext"
3DESCRIPTION = "X server resource database utility" 3DESCRIPTION = "X server resource database utility"
4MAINTAINER = "Rene Wagner <rw@handhelds.org>" 4MAINTAINER = "Rene Wagner <rw@handhelds.org>"
5SECTION = "x11/base" 5SECTION = "x11/base"
diff --git a/meta/packages/xset/xset/autofoo.patch b/meta/packages/xorg-app/xset/autofoo.patch
index 039d1319e3..039d1319e3 100644
--- a/meta/packages/xset/xset/autofoo.patch
+++ b/meta/packages/xorg-app/xset/autofoo.patch
diff --git a/meta/packages/xset/xset/disable-xkb.patch b/meta/packages/xorg-app/xset/disable-xkb.patch
index 6060fbb995..6060fbb995 100644
--- a/meta/packages/xset/xset/disable-xkb.patch
+++ b/meta/packages/xorg-app/xset/disable-xkb.patch
diff --git a/meta/packages/xset/xset_20040817.bb b/meta/packages/xorg-app/xset_20040817.bb
index daf57d15c8..90247fdb26 100644
--- a/meta/packages/xset/xset_20040817.bb
+++ b/meta/packages/xorg-app/xset_20040817.bb
@@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
5PV = "0.0+cvs${FIXEDSRCDATE}" 5PV = "0.0+cvs${FIXEDSRCDATE}"
6PR = "r1" 6PR = "r1"
7 7
8DEPENDS = "libx11 libxext xextensions libxmu" 8DEPENDS = "virtual/libx11 libxext xextensions libxmu"
9 9
10CFLAGS += "-D_GNU_SOURCE" 10CFLAGS += "-D_GNU_SOURCE"
11 11
diff --git a/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b8b204e657
--- /dev/null
+++ b/meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -0,0 +1,13 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "user preference utility for X"
4MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
5LICENSE = "MIT"
6
7DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
8
9SRC_URI += "file://disable-xkb.patch;patch=1"
10
11CFLAGS += "-D_GNU_SOURCE"
12EXTRA_OECONF = "--disable-xkb"
13
diff --git a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b8b204e657
--- /dev/null
+++ b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -0,0 +1,13 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "user preference utility for X"
4MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
5LICENSE = "MIT"
6
7DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
8
9SRC_URI += "file://disable-xkb.patch;patch=1"
10
11CFLAGS += "-D_GNU_SOURCE"
12EXTRA_OECONF = "--disable-xkb"
13
diff --git a/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff b/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..54b1727a95
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
1--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
3@@ -83,6 +83,7 @@
4 * from UCS char to specified charset char.
5 * This converter is needed for _XimGetCharCode subroutine.
6 */
7+#ifdef XLOCALE
8 XPointer
9 _XimGetLocaleCode (
10 _Xconst char* encoding_name)
11@@ -96,6 +97,7 @@
12 }
13 return cvt;
14 }
15+#endif
16
17 /*
18 * Returns the locale dependent representation of a keysym.
19@@ -107,6 +109,7 @@
20 * locale
21 */
22 /*ARGSUSED*/
23+#ifdef XLOCALE
24 int
25 _XimGetCharCode (
26 XPointer ucs_conv,
27@@ -135,6 +138,7 @@
28 buf[count]= '\0';
29 return count;
30 }
31+#endif
32
33 #ifdef XKB
34 static int lookup_string(
35--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
36+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
37@@ -0,0 +1,428 @@
38+/*
39+ * X18NCMSstubs.c
40+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
41+ *
42+ * Copyright © 2003 Matthew Allum
43+ *
44+ * Permission to use, copy, modify, distribute, and sell this software and its
45+ * documentation for any purpose is hereby granted without fee, provided that
46+ * the above copyright notice appear in all copies and that both that
47+ * copyright notice and this permission notice appear in supporting
48+ * documentation, and that the name of Matthew Allum not be used in
49+ * advertising or publicity pertaining to distribution of the software without
50+ * specific, written prior permission. Keith Packard and Compaq makes no
51+ * representations about the suitability of this software for any purpose. It
52+ * is provided "as is" without express or implied warranty.
53+ *
54+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
55+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
56+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
57+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
58+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
59+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
60+ * PERFORMANCE OF THIS SOFTWARE.
61+ */
62+
63+#include <stdlib.h>
64+#include "Xlibint.h"
65+#include "Xlcint.h"
66+#include <X11/Xlocale.h>
67+#include <X11/Xos.h>
68+#ifdef WIN32
69+#undef close
70+#endif
71+#include <X11/Xutil.h>
72+#include "XlcPubI.h"
73+
74+#include "Xcmsint.h" /* for XcmsCCC type */
75+#include "XlcPubI.h" /* for XLCd type */
76+#include "config.h"
77+
78+#if ! XLOCALE
79+
80+Bool
81+XSupportsLocale()
82+{
83+ return False;
84+}
85+
86+char *
87+XSetLocaleModifiers(
88+ const char *modifiers)
89+{
90+ return NULL;
91+}
92+
93+XLCd
94+_XOpenLC(
95+ char *name)
96+{
97+ return NULL;
98+}
99+
100+XLCd
101+_XlcCurrentLC()
102+{
103+ return NULL;
104+}
105+
106+void
107+_XlcVaToArgList(
108+ va_list var,
109+ int count,
110+ XlcArgList *args_ret)
111+{
112+ return;
113+}
114+
115+void
116+_XlcCountVaList(
117+ va_list var,
118+ int *count_ret)
119+{
120+ return;
121+}
122+
123+void
124+_XCloseLC(
125+ XLCd lcd)
126+{
127+ return;
128+}
129+
130+int
131+_XlcConvert(
132+ XlcConv conv,
133+ XPointer *from,
134+ int *from_left,
135+ XPointer *to,
136+ int *to_left,
137+ XPointer *args,
138+ int num_args)
139+{
140+ return 0;
141+}
142+
143+/* XIM Stubs */
144+
145+XPointer
146+_XimGetLocaleCode ( _Xconst char* encoding_name )
147+{
148+ return NULL;
149+}
150+
151+int
152+_XimGetCharCode (
153+ XPointer ucs_conv,
154+ KeySym keysym,
155+ unsigned char* buf,
156+ int nbytes)
157+{
158+ return 0;
159+}
160+
161+/* Xrm Stubs */
162+
163+XrmMethods
164+_XrmInitParseInfo(
165+ XPointer *state)
166+{
167+ return (XrmMethods) NULL;
168+}
169+
170+/* Xwc Stubs */
171+
172+int
173+XwcTextExtents(
174+ XFontSet font_set,
175+ _Xconst wchar_t *text,
176+ int text_len,
177+ XRectangle *overall_ink_extents,
178+ XRectangle *overall_logical_extents)
179+{
180+ return 0;
181+}
182+
183+void
184+XwcDrawString(Display *display,
185+ Drawable d,
186+ XFontSet font_set,
187+ GC gc,
188+ int x, int y,
189+ _Xconst wchar_t *string,
190+ int num_wchars)
191+{
192+ ;
193+}
194+
195+void
196+XwcDrawText(
197+ Display *dpy,
198+ Drawable d,
199+ GC gc,
200+ int x,
201+ int y,
202+ XwcTextItem *text_items,
203+ int nitems)
204+{
205+ ;
206+}
207+
208+void
209+XwcDrawImageString(
210+ Display *dpy,
211+ Drawable d,
212+ XFontSet font_set,
213+ GC gc,
214+ int x,
215+ int y,
216+ _Xconst wchar_t *text,
217+ int text_len)
218+{
219+ ;
220+}
221+
222+int
223+XwcTextEscapement(
224+ XFontSet font_set,
225+ _Xconst wchar_t *text,
226+ int text_len)
227+{
228+ return 0;
229+}
230+
231+Status
232+XwcTextPerCharExtents(
233+ XFontSet font_set,
234+ _Xconst wchar_t *text,
235+ int text_len,
236+ XRectangle *ink_extents_buffer,
237+ XRectangle *logical_extents_buffer,
238+ int buffer_size,
239+ int *num_chars,
240+ XRectangle *max_ink_extents,
241+ XRectangle *max_logical_extents)
242+{
243+ ;
244+}
245+
246+int
247+XwcTextPropertyToTextList(
248+ Display *dpy,
249+ const XTextProperty *text_prop,
250+ wchar_t ***list_ret,
251+ int *count_ret)
252+{
253+ return 0;
254+}
255+
256+int
257+XwcTextListToTextProperty(
258+ Display *dpy,
259+ wchar_t **list,
260+ int count,
261+ XICCEncodingStyle style,
262+ XTextProperty *text_prop)
263+{
264+ return 0;
265+}
266+
267+void
268+XwcFreeStringList(wchar_t **list)
269+{
270+ return;
271+}
272+
273+
274+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
275+ Display *dpy,
276+ Window w,
277+ _Xconst char *windowName,
278+ _Xconst char *iconName,
279+ char **argv,
280+ int argc,
281+ XSizeHints *sizeHints,
282+ XWMHints *wmHints,
283+ XClassHint *classHints)
284+{
285+ return;
286+}
287+
288+int
289+XmbTextPropertyToTextList(
290+ Display *dpy,
291+ const XTextProperty *text_prop,
292+ char ***list_ret,
293+ int *count_ret)
294+{
295+ return XLocaleNotSupported;
296+}
297+
298+int
299+XmbTextListToTextProperty(
300+ Display *dpy,
301+ char **list,
302+ int count,
303+ XICCEncodingStyle style,
304+ XTextProperty *text_prop)
305+{
306+ return XLocaleNotSupported;
307+}
308+
309+int
310+XmbTextExtents(
311+ XFontSet font_set,
312+ _Xconst char *text,
313+ int text_len,
314+ XRectangle *overall_ink_extents,
315+ XRectangle *overall_logical_extents)
316+{
317+ return 0;
318+}
319+
320+void
321+XmbDrawText(
322+ Display *dpy,
323+ Drawable d,
324+ GC gc,
325+ int x,
326+ int y,
327+ XmbTextItem *text_items,
328+ int nitems)
329+{
330+ ;
331+}
332+
333+void
334+XmbDrawString(
335+ Display *dpy,
336+ Drawable d,
337+ XFontSet font_set,
338+ GC gc,
339+ int x,
340+ int y,
341+ _Xconst char *text,
342+ int text_len)
343+{
344+ ;
345+}
346+
347+void
348+XmbDrawImageString(
349+ Display *dpy,
350+ Drawable d,
351+ XFontSet font_set,
352+ GC gc,
353+ int x,
354+ int y,
355+ _Xconst char *text,
356+ int text_len)
357+{
358+ ;
359+}
360+
361+int
362+XmbTextEscapement(
363+ XFontSet font_set,
364+ _Xconst char *text,
365+ int text_len)
366+{
367+ return 0;
368+}
369+
370+Status
371+XmbTextPerCharExtents(
372+ XFontSet font_set,
373+ _Xconst char *text,
374+ int text_len,
375+ XRectangle *ink_extents_buffer,
376+ XRectangle *logical_extents_buffer,
377+ int buffer_size,
378+ int *num_chars,
379+ XRectangle *max_ink_extents,
380+ XRectangle *max_logical_extents)
381+{
382+ return 0;
383+}
384+
385+unsigned int
386+KeySymToUcs4(KeySym keysym)
387+{
388+ return 0;
389+}
390+
391+#endif
392+
393+#if ! XCMS
394+
395+XcmsCCC
396+XcmsCCCOfColormap(dpy, cmap)
397+ Display *dpy;
398+ Colormap cmap;
399+{
400+ return NULL;
401+}
402+
403+Status
404+_XcmsResolveColorString (
405+ XcmsCCC ccc,
406+ const char **color_string,
407+ XcmsColor *pColor_exact_return,
408+ XcmsColorFormat result_format)
409+{
410+ return(XcmsFailure);
411+}
412+
413+void
414+_XcmsUnresolveColor(
415+ XcmsCCC ccc,
416+ XcmsColor *pColor)
417+{
418+ return;
419+}
420+
421+void
422+_XUnresolveColor(
423+ XcmsCCC ccc,
424+ XColor *pXColor)
425+{
426+ return;
427+}
428+
429+XcmsCmapRec *
430+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
431+ Display *dpy;
432+ Colormap cmap;
433+ Window windowID;
434+ Visual *visual;
435+{
436+ return NULL;
437+}
438+
439+void
440+_XcmsRGB_to_XColor(
441+ XcmsColor *pColors,
442+ XColor *pXColors,
443+ unsigned int nColors)
444+{
445+ return;
446+}
447+
448+XcmsCmapRec *
449+_XcmsCopyCmapRecAndFree(
450+ Display *dpy,
451+ Colormap src_cmap,
452+ Colormap copy_cmap)
453+{
454+ return NULL;
455+}
456+
457+void
458+_XcmsDeleteCmapRec(
459+ Display *dpy,
460+ Colormap cmap)
461+{
462+ return;
463+}
464+
465+#endif
466--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
467+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
468@@ -331,6 +331,8 @@
469 libX11_la_SOURCES+=UIThrStubs.c
470 endif
471
472+libX11_la_SOURCES+=X18NCMSstubs.c
473+
474 x11datadir = @X11_DATADIR@
475 x11data_DATA = XKeysymDB XErrorDB
476
477@@ -338,7 +340,8 @@
478 $(x11data_DATA) \
479 os2Stubs.c \
480 udcInf.c \
481- UIThrStubs.c
482+ UIThrStubs.c \
483+ X18NCMSstubs.c
484
485 #
486 # Figure out which sub-libraries to link into Xlib
487--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
488+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
489@@ -55,7 +55,9 @@
490 #define NUM_FREE_CVLS 4
491
492 /* in lcWrap.c */
493+#ifdef XLOCALE
494 extern LockInfoPtr _Xi18n_lock;
495+#endif
496
497 #ifdef WIN32
498 static DWORD _X_TlsIndex = (DWORD)-1;
499@@ -625,9 +627,11 @@
500 _Xglobal_lock = &global_lock;
501 xmutex_init(_Xglobal_lock->lock);
502 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
503+#ifdef XLOCALE
504 _Xi18n_lock = &i18n_lock;
505 xmutex_init(_Xi18n_lock->lock);
506 xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
507+#endif
508 _XLockMutex_fn = _XLockMutex;
509 _XUnlockMutex_fn = _XUnlockMutex;
510 _XCreateMutex_fn = _XCreateMutex;
511--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
512+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
513@@ -215,7 +215,14 @@
514 esac
515 AC_SUBST(KEYSYMDEF)
516
517-AM_CONDITIONAL(UDC, test xfalse = xtrue)
518+AC_ARG_ENABLE(udc,
519+ AC_HELP_STRING([--disable-udc],
520+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
521+ [UDC=$enableval],[UDC=yes])
522+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
523+if test x"$UDC" = "xyes"; then
524+ AC_DEFINE(UDC,1,[Include support for UDC])
525+fi
526
527 AC_ARG_ENABLE(xcms,
528 AC_HELP_STRING([--disable-xcms],
diff --git a/meta/packages/xlibs/libx11/autofoo.patch b/meta/packages/xorg-lib/diet-x11/autofoo.patch
index 8bdba09768..8bdba09768 100644
--- a/meta/packages/xlibs/libx11/autofoo.patch
+++ b/meta/packages/xorg-lib/diet-x11/autofoo.patch
diff --git a/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff b/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
new file mode 100644
index 0000000000..9dbf6dac68
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
1--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
3@@ -701,7 +701,11 @@
4 }
5 if (l - 2 - (p - charset) < 0)
6 return 0;
7+#ifdef XLOCALE
8 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
9+#else
10+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
11+#endif
12 return 0;
13 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
14 return 0;
diff --git a/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..a098db1941
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
7+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
8@@ -103,7 +103,7 @@
9
10 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
11 November 2000. Its presence is indicated through the following macro. */
12-#define X_HAVE_UTF8_STRING 1
13+#undef X_HAVE_UTF8_STRING
14
15 typedef char *XPointer;
16
diff --git a/meta/packages/xorg-lib/diet-x11/xim.patch b/meta/packages/xorg-lib/diet-x11/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11/xim.patch
@@ -0,0 +1,55 @@
1--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
2+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
3@@ -90,6 +90,52 @@
4 return;
5 }
6
7+XIM
8+XOpenIM (
9+ Display* display,
10+ struct _XrmHashBucketRec* rdb,
11+ char* res_name,
12+ char* res_class)
13+{
14+ return (XIM) NULL;
15+}
16+
17+Status
18+XCloseIM ( XIM im )
19+{
20+ return NULL;
21+}
22+
23+XIC
24+XCreateIC ( XIM im, ...)
25+{
26+ return NULL;
27+}
28+
29+void
30+XDestroyIC ( XIC ic )
31+{
32+ return;
33+}
34+
35+int
36+XmbLookupString (
37+ XIC ic,
38+ XKeyPressedEvent* ev,
39+ char* buffer,
40+ int nbytes,
41+ KeySym* keysym,
42+ Status* status)
43+{
44+ return XLookupNone;
45+}
46+
47+char *
48+XGetICValues( XIC ic, ...)
49+{
50+ return (char *) NULL;
51+}
52+
53 XPointer
54 _XimGetLocaleCode ( _Xconst char* encoding_name )
55 {
diff --git a/meta/packages/xlibs/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_20050226.bb
index 284fcc21cc..1220806052 100644
--- a/meta/packages/xlibs/diet-x11_6.2.1.bb
+++ b/meta/packages/xorg-lib/diet-x11_20050226.bb
@@ -1,10 +1,6 @@
1SECTION = "x11/base" 1SECTION = "x11/base"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" 2require libx11_${PV}.bb
3include libx11_${PV}.bb
4 3
5EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" 4EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
6CFLAGS += "-D_GNU_SOURCE"
7 5
8SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" 6SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
9
10
diff --git a/meta/packages/xorg-lib/diet-x11_6.2.1.bb b/meta/packages/xorg-lib/diet-x11_6.2.1.bb
new file mode 100644
index 0000000000..96d63aa0ee
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_6.2.1.bb
@@ -0,0 +1,9 @@
1SECTION = "x11/base"
2require libx11_${PV}.bb
3
4EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
5CFLAGS += "-D_GNU_SOURCE"
6
7SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
8 file://xim.patch;patch=1"
9
diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b30098c850
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
1SECTION = "x11/base"
2require libx11_${PV}.bb
3
4EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
5CFLAGS += "-D_GNU_SOURCE"
6
7SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
8 file://fix-disable-xlocale.diff;patch=1 \
9 file://fix-utf8-wrong-define.patch;patch=1"
10
11#do_stage_append () {
12# rm -f ${STAGING_INCDIR}/X11/XKBlib.h
13#}
diff --git a/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..33e50df13a
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
1SECTION = "x11/base"
2require libx11_${PV}.bb
3
4EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
5CFLAGS += "-D_GNU_SOURCE"
6
7SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
8 file://fix-disable-xlocale.diff;patch=1 \
9 file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/meta/packages/xorg-lib/diet-x11_cvs.bb b/meta/packages/xorg-lib/diet-x11_cvs.bb
new file mode 100644
index 0000000000..968764b500
--- /dev/null
+++ b/meta/packages/xorg-lib/diet-x11_cvs.bb
@@ -0,0 +1,7 @@
1SECTION = "x11/base"
2require libx11_cvs.bb
3
4EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
5
6SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
7 file://xim.patch;patch=1"
diff --git a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
index f43d38065e..f43d38065e 100644
--- a/meta/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch
+++ b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
diff --git a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/meta/packages/xlibs/libx11/fix-utf8-wrong-define.patch
+++ b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch
diff --git a/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..28abffa735
--- /dev/null
+++ b/meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto applewmproto"
6
7XORG_PN = "libAppleWM"
8
diff --git a/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a612982a95
--- /dev/null
+++ b/meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a612982a95
--- /dev/null
+++ b/meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb
@@ -0,0 +1,5 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto dmxproto"
diff --git a/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..cecd14f57f
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,12 @@
1DESCRIPTION = "X fontenc library (used by libxfont)."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4#MAINTAINER = ""
5LICENSE = "BSD-X"
6
7DEPENDS = "zlib-native xproto-native"
8
9SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2"
10S = "${WORKDIR}/libfontenc-${PV}"
11
12inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..0ccc8dd3d3
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,12 @@
1DESCRIPTION = "X libfontenc library (used by libxfont)."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4#MAINTAINER = ""
5LICENSE = "BSD-X"
6
7DEPENDS = "zlib-native xproto-native"
8
9SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2"
10S = "${WORKDIR}/libfontenc-${PV}"
11
12inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a4badc38ce
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X fontenc library (used by libxfont)."
4LICENSE = "BSD-X"
5PRIORITY = "optional"
6
7DEPENDS += " zlib xproto"
8
diff --git a/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a4badc38ce
--- /dev/null
+++ b/meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X fontenc library (used by libxfont)."
4LICENSE = "BSD-X"
5PRIORITY = "optional"
6
7DEPENDS += " zlib xproto"
8
diff --git a/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5c07ce682c
--- /dev/null
+++ b/meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = " "
4
5DEPENDS += " xproto fontsproto xtrans"
6
7XORG_PN = "libFS"
8
diff --git a/meta/packages/xlibs/libice/autofoo.patch b/meta/packages/xorg-lib/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/meta/packages/xlibs/libice/autofoo.patch
+++ b/meta/packages/xorg-lib/libice/autofoo.patch
diff --git a/meta/packages/xlibs/libice_6.3.3.bb b/meta/packages/xorg-lib/libice_6.3.3.bb
index 1311145334..e771161e59 100644
--- a/meta/packages/xlibs/libice_6.3.3.bb
+++ b/meta/packages/xorg-lib/libice_6.3.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
2LICENSE= "MIT" 2LICENSE= "MIT"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Phil Blundell <pb@handhelds.org>" 4MAINTAINER = "Phil Blundell <pb@handhelds.org>"
5DEPENDS = "libx11" 5DEPENDS = "virtual/libx11"
6PROVIDES = "ice" 6PROVIDES = "ice"
7DESCRIPTION = "X11 ICE library" 7DESCRIPTION = "X11 ICE library"
8PR = "r1" 8PR = "r1"
diff --git a/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..da40983162
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 ICE library"
4PRIORITY = "optional"
5
6DEPENDS += " xproto xtrans"
7PROVIDES = "ice"
8
9XORG_PN = "libICE"
10
diff --git a/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..da40983162
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 ICE library"
4PRIORITY = "optional"
5
6DEPENDS += " xproto xtrans"
7PROVIDES = "ice"
8
9XORG_PN = "libICE"
10
diff --git a/meta/packages/xorg-lib/libice_cvs.bb b/meta/packages/xorg-lib/libice_cvs.bb
new file mode 100644
index 0000000000..1756a235d7
--- /dev/null
+++ b/meta/packages/xorg-lib/libice_cvs.bb
@@ -0,0 +1,17 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "MIT"
3SECTION = "libs"
4PRIORITY = "optional"
5DEPENDS = "virtual/libx11"
6PROVIDES = "ice"
7DESCRIPTION = "X11 ICE library"
8PR = "r1"
9
10SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
11S = "${WORKDIR}/ICE"
12
13inherit autotools pkgconfig
14
15do_stage () {
16 autotools_stage_all
17}
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
new file mode 100644
index 0000000000..58463db46b
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil/mkg3states.patch
@@ -0,0 +1,51 @@
1--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500
2+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500
3@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
4
5 AC_OUTPUT([Makefile
6 src/Makefile
7+ src/image/Makefile
8 lbxutil.pc])
9--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500
10+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500
11@@ -1,9 +1,6 @@
12 lib_LTLIBRARIES = liblbxutil.la
13
14-noinst_PROGRAMS = mkg3states
15-
16-mkg3states_SOURCES = \
17- $(srcdir)/image/mkg3states.c
18+SUBDIRS = image
19
20 liblbxutil_la_SOURCES = \
21 $(srcdir)/lbx_zlib/reqstats.h \
22@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@
23
24 $(srcdir)/image/dfaxg42d.c: g3states.h
25
26-g3states.h: mkg3states
27- -rm -f g3states.h
28- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
29+g3states.h: image/mkg3states
30+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
31
32 liblbxutil_la_LDFLAGS = -version-number 1:0:0
33
34--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500
35+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500
36@@ -0,0 +1,15 @@
37+# evil hack
38+CFLAGS=$(CFLAGS_FOR_BUILD)
39+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
40+LDFLAGS=$(LDFLAGS_FOR_BUILD)
41+
42+CC=$(CC_FOR_BUILD)
43+LIBTOOL = @LIBTOOL@ --tag=CC
44+
45+noinst_PROGRAMS = mkg3states
46+
47+mkg3states_SOURCES = \
48+ mkg3states.c
49+
50+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
51+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..df8b267601
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "XFIXES Extension"
4
5DEPENDS += " xextproto xproto zlib"
6PROVIDES = "lbxutil"
diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..df8b267601
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "XFIXES Extension"
4
5DEPENDS += " xextproto xproto zlib"
6PROVIDES = "lbxutil"
diff --git a/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2a380a65f6
--- /dev/null
+++ b/meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11"
6
7XORG_PN = "liboldX"
8
diff --git a/meta/packages/xlibs/libsm/autofoo.patch b/meta/packages/xorg-lib/libsm/autofoo.patch
index 8cb204a66e..8cb204a66e 100644
--- a/meta/packages/xlibs/libsm/autofoo.patch
+++ b/meta/packages/xorg-lib/libsm/autofoo.patch
diff --git a/meta/packages/xlibs/libsm_6.0.3.bb b/meta/packages/xorg-lib/libsm_6.0.3.bb
index 08f9597045..cd374649bb 100644
--- a/meta/packages/xlibs/libsm_6.0.3.bb
+++ b/meta/packages/xorg-lib/libsm_6.0.3.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
2LICENSE = "MIT-X" 2LICENSE = "MIT-X"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Phil Blundell <pb@handhelds.org>" 4MAINTAINER = "Phil Blundell <pb@handhelds.org>"
5DEPENDS = "libx11 libice" 5DEPENDS = "virtual/libx11 libice"
6DESCRIPTION = "Session management library" 6DESCRIPTION = "Session management library"
7PR = "r1" 7PR = "r1"
8 8
diff --git a/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..383e29e743
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Session management library"
4PRIORITY = "optional"
5
6DEPENDS += " libice xproto xtrans"
7
8XORG_PN = "libSM"
9
diff --git a/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..383e29e743
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Session management library"
4PRIORITY = "optional"
5
6DEPENDS += " libice xproto xtrans"
7
8XORG_PN = "libSM"
9
diff --git a/meta/packages/xorg-lib/libsm_cvs.bb b/meta/packages/xorg-lib/libsm_cvs.bb
new file mode 100644
index 0000000000..45d6bfa236
--- /dev/null
+++ b/meta/packages/xorg-lib/libsm_cvs.bb
@@ -0,0 +1,18 @@
1PV = "6.0.3+cvs${SRCDATE}"
2LICENSE = "MIT-X"
3SECTION = "libs"
4PRIORITY = "optional"
5DEPENDS = "virtual/libx11 libice"
6DESCRIPTION = "Session management library"
7PR = "r1"
8
9DEFAULT_PREFERENCE="-1"
10
11SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
12S = "${WORKDIR}/SM"
13
14inherit autotools pkgconfig
15
16do_stage () {
17 autotools_stage_all
18}
diff --git a/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..90b8aeca49
--- /dev/null
+++ b/meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto windowswmproto"
6
7XORG_PN = "libWindowsWM"
8
diff --git a/meta/packages/xlibs/libx11-native_6.2.1.bb b/meta/packages/xorg-lib/libx11-native_6.2.1.bb
index 9513c4237e..54bb4486e7 100644
--- a/meta/packages/xlibs/libx11-native_6.2.1.bb
+++ b/meta/packages/xorg-lib/libx11-native_6.2.1.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/base" 1SECTION = "x11/base"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" 2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
3include libx11_${PV}.bb 3require libx11_${PV}.bb
4inherit native 4inherit native
5DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" 5DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
6PROVIDES = "" 6PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2023b5741d
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,25 @@
1DESCRIPTION = "Base X libs."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4LICENSE = "XFree86"
5
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
7
8DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
9PROVIDES = "x11-native"
10
11SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
12S = "${WORKDIR}/libX11-${PV}"
13
14inherit native autotools pkgconfig
15
16EXTRA_OECONF="--enable-malloc0returnsnull"
17
18do_compile() {
19 (
20 unset CC LD CXX CCLD
21 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
22 )
23 rm -f ${STAGING_INCDIR}/X11/Xlib.h
24 oe_runmake
25}
diff --git a/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..2b84b2c53c
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,25 @@
1DESCRIPTION = "Base X libs."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4LICENSE = "XFree86"
5
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
7
8DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
9PROVIDES = "x11-native"
10
11SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
12S = "${WORKDIR}/libX11-${PV}"
13
14inherit native autotools pkgconfig
15
16EXTRA_OECONF="--enable-malloc0returnsnull"
17
18do_compile() {
19 (
20 unset CC LD CXX CCLD
21 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
22 )
23 rm -f ${STAGING_INCDIR}/X11/Xlib.h
24 oe_runmake
25}
diff --git a/meta/packages/xorg-lib/libx11-native_cvs.bb b/meta/packages/xorg-lib/libx11-native_cvs.bb
new file mode 100644
index 0000000000..c76d4dce8b
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-native_cvs.bb
@@ -0,0 +1,5 @@
1SECTION = "x11/base"
2require libx11_cvs.bb
3inherit native
4DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
5PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libx11/autofoo.patch b/meta/packages/xorg-lib/libx11/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11/autofoo.patch
@@ -0,0 +1,22 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- libX11-6.2.1/configure.ac~autofoo
7+++ libX11-6.2.1/configure.ac
8@@ -7,12 +7,12 @@
9 [jg@freedesktop.org],
10 libX11)
11 AC_CONFIG_SRCDIR([Makefile.am])
12-AM_INIT_AUTOMAKE([dist-bzip2])
13+AC_CONFIG_AUX_DIR(.)
14
15+AM_INIT_AUTOMAKE([dist-bzip2])
16 AM_MAINTAINER_MODE
17
18 AM_CONFIG_HEADER([src/config.h])
19-AC_CONFIG_AUX_DIR(.)
20
21 # Checks for programs.
22 AC_PROG_LIBTOOL
diff --git a/meta/packages/xorg-lib/libx11_20050226.bb b/meta/packages/xorg-lib/libx11_20050226.bb
new file mode 100644
index 0000000000..2fa9e995b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_20050226.bb
@@ -0,0 +1,6 @@
1SRCDATE = "20050226"
2
3require libx11_cvs.bb
4
5DEFAULT_PREFERENCE = "0"
6
diff --git a/meta/packages/xlibs/libx11_6.2.1.bb b/meta/packages/xorg-lib/libx11_6.2.1.bb
index 901746bafa..ce57c42f7f 100644
--- a/meta/packages/xlibs/libx11_6.2.1.bb
+++ b/meta/packages/xorg-lib/libx11_6.2.1.bb
@@ -3,7 +3,8 @@ LICENSE = "XFree86"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Greg Gilbert <greg@treke.net>" 4MAINTAINER = "Greg Gilbert <greg@treke.net>"
5DEPENDS = "xproto xextensions libxau xtrans libxdmcp" 5DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
6PROVIDES = "x11" 6PROVIDES = "virtual/libx11"
7RPROVIDES = "virtual/libx11"
7DESCRIPTION = "Base X libs." 8DESCRIPTION = "Base X libs."
8FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" 9FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
9FILES_${PN}-locale += "${datadir}/X11/locale" 10FILES_${PN}-locale += "${datadir}/X11/locale"
diff --git a/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b31ed72998
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
@@ -0,0 +1,22 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Base X libs."
4
5DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
6 libxdmcp xf86bigfontproto kbproto inputproto"
7PROVIDES = "virtual/libx11"
8RPROVIDES = "virtual/libx11"
9
10XORG_PN = "libX11"
11
12FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
13FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
14
15do_compile() {
16 (
17 unset CC LD CXX CCLD
18 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
19 )
20 rm -f ${STAGING_INCDIR}/X11/Xlib.h
21 oe_runmake
22}
diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b31ed72998
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,22 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Base X libs."
4
5DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
6 libxdmcp xf86bigfontproto kbproto inputproto"
7PROVIDES = "virtual/libx11"
8RPROVIDES = "virtual/libx11"
9
10XORG_PN = "libX11"
11
12FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
13FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
14
15do_compile() {
16 (
17 unset CC LD CXX CCLD
18 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
19 )
20 rm -f ${STAGING_INCDIR}/X11/Xlib.h
21 oe_runmake
22}
diff --git a/meta/packages/xorg-lib/libx11_cvs.bb b/meta/packages/xorg-lib/libx11_cvs.bb
new file mode 100644
index 0000000000..aaa052eba3
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_cvs.bb
@@ -0,0 +1,42 @@
1PV = "6.2.1+cvs${SRCDATE}"
2LICENSE = "XFree86"
3PR = "r6"
4SECTION = "x11/libs"
5PRIORITY = "optional"
6MAINTAINER = "Greg Gilbert <greg@treke.net>"
7DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
8PROVIDES = "virtual/libx11"
9RPROVIDES = "virtual/libx11"
10DESCRIPTION = "Base X libs."
11FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
12FILES_${PN}-locale += "${datadir}/X11/locale"
13
14SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
15 file://errordb-keysymdb-path-fix.patch;patch=1"
16S = "${WORKDIR}/X11"
17
18inherit autotools pkgconfig
19
20do_compile() {
21 (
22 unset CC LD CXX CCLD
23# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
24 oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
25 )
26 rm -f ${STAGING_INCDIR}/X11/Xlib.h
27 oe_runmake
28}
29
30do_stage() {
31 install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
32 install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
33 install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
34 install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
35 install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
36 install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
37 install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
38 install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
39 install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
40
41 oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
42}
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
new file mode 100644
index 0000000000..3f7fd5853e
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -0,0 +1,33 @@
1DEFAULT_PREFERENCE = "-1"
2
3DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
4SECTION = "x11/libs"
5PRIORITY = "optional"
6LICENSE = "XFree86"
7
8DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
9PROVIDES = "virtual/libx11"
10RPROVIDES = "virtual/libx11"
11
12FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
13FILES_${PN}-locale += "${datadir}/X11/locale"
14
15SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
16S = "${WORKDIR}/git"
17
18inherit autotools pkgconfig
19
20EXTRA_OECONF="--enable-malloc0returnsnull"
21
22do_compile() {
23 (
24 unset CC LD CXX CCLD
25 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
26 )
27 rm -f ${STAGING_INCDIR}/X11/Xlib.h
28 oe_runmake
29}
30
31do_stage() {
32 autotools_stage_all
33}
diff --git a/meta/packages/xlibs/libxau-native_0.1.1.bb b/meta/packages/xorg-lib/libxau-native_0.1.1.bb
index ecb71ce3d6..f5acbee736 100644
--- a/meta/packages/xlibs/libxau-native_0.1.1.bb
+++ b/meta/packages/xorg-lib/libxau-native_0.1.1.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/base" 1SECTION = "x11/base"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" 2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
3include libxau_${PV}.bb 3require libxau_${PV}.bb
4inherit native 4inherit native
5DEPENDS = "xproto-native" 5DEPENDS = "xproto-native"
6PROVIDES = "" 6PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..553c3aeacf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
1SECTION = "x11/libs"
2PRIORITY = "optional"
3#MAINTAINER = ""
4LICENSE = "BSD-X"
5
6DEPENDS = "xproto-native util-macros-native"
7
8SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
9S = "${WORKDIR}/libXau-${PV}"
10
11inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..c0a3ea802f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
1SECTION = "x11/libs"
2PRIORITY = "optional"
3#MAINTAINER = ""
4LICENSE = "BSD-X"
5
6DEPENDS = "xproto-native util-macros-native"
7
8SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2"
9S = "${WORKDIR}/libXau-${PV}"
10
11inherit native autotools pkgconfig
diff --git a/meta/packages/xlibs/libxau-native_cvs.bb b/meta/packages/xorg-lib/libxau-native_cvs.bb
index cd070033ce..685f849bd5 100644
--- a/meta/packages/xlibs/libxau-native_cvs.bb
+++ b/meta/packages/xorg-lib/libxau-native_cvs.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/base" 1SECTION = "x11/base"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" 2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
3include libxau_cvs.bb 3require libxau_cvs.bb
4inherit native 4inherit native
5DEPENDS = "xproto-native" 5DEPENDS = "xproto-native"
6PROVIDES = "" 6PROVIDES = ""
diff --git a/meta/packages/xlibs/libxau/autofoo.patch b/meta/packages/xorg-lib/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/meta/packages/xlibs/libxau/autofoo.patch
+++ b/meta/packages/xorg-lib/libxau/autofoo.patch
diff --git a/meta/packages/xlibs/libxau_0.1.1.bb b/meta/packages/xorg-lib/libxau_0.1.1.bb
index dc1a28171b..dc1a28171b 100644
--- a/meta/packages/xlibs/libxau_0.1.1.bb
+++ b/meta/packages/xorg-lib/libxau_0.1.1.bb
diff --git a/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5ad793c9b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "A Sample Authorization Protocol for X"
4PRIORITY = "optional"
5
6DEPENDS += " xproto"
7PROVIDES = "xau"
8
9XORG_PN = "libXau"
10
diff --git a/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..5ad793c9b8
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "A Sample Authorization Protocol for X"
4PRIORITY = "optional"
5
6DEPENDS += " xproto"
7PROVIDES = "xau"
8
9XORG_PN = "libXau"
10
diff --git a/meta/packages/xlibs/libxau_cvs.bb b/meta/packages/xorg-lib/libxau_cvs.bb
index 518744816d..518744816d 100644
--- a/meta/packages/xlibs/libxau_cvs.bb
+++ b/meta/packages/xorg-lib/libxau_cvs.bb
diff --git a/meta/packages/xorg-lib/libxaw/auxdir.patch b/meta/packages/xorg-lib/libxaw/auxdir.patch
new file mode 100644
index 0000000000..4226ab6a4d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw/auxdir.patch
@@ -0,0 +1,10 @@
1--- /tmp/configure.ac 2005-06-17 21:26:17.519157272 +0200
2+++ libXaw-7.0.2/configure.ac 2005-06-17 21:26:34.832525240 +0200
3@@ -10,7 +10,6 @@
4 AM_INIT_AUTOMAKE([dist-bzip2])
5
6 AM_CONFIG_HEADER(config.h)
7-AC_CONFIG_AUX_DIR(.)
8
9 # Check for progs
10 AC_PROG_CC
diff --git a/meta/packages/xorg-lib/libxaw_7.0.2.bb b/meta/packages/xorg-lib/libxaw_7.0.2.bb
new file mode 100644
index 0000000000..04f2855101
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_7.0.2.bb
@@ -0,0 +1,21 @@
1SECTION = "x11/libs"
2LICENSE = "MIT"
3PRIORITY = "optional"
4MAINTAINER = "Phil Blundell <pb@handhelds.org>"
5DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
6PROVIDES = "xaw"
7DESCRIPTION = "X Athena Widgets library"
8
9SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \
10 file://auxdir.patch;patch=1"
11
12S = "${WORKDIR}/libXaw-${PV}"
13
14inherit autotools pkgconfig
15
16# FIXME: libXaw needs a full x11, not diet
17BROKEN = "1"
18
19do_stage () {
20 autotools_stage_all
21}
diff --git a/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3961042a2d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
@@ -0,0 +1,15 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xaw is the X Athena Widget Set."
4
5DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
6PROVIDES = "xaw"
7
8XORG_PN = "libXaw"
9
10do_stage () {
11 autotools_stage_all
12 ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
13 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
14 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
15}
diff --git a/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3961042a2d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,15 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xaw is the X Athena Widget Set."
4
5DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
6PROVIDES = "xaw"
7
8XORG_PN = "libXaw"
9
10do_stage () {
11 autotools_stage_all
12 ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
13 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
14 ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
15}
diff --git a/meta/packages/xorg-lib/libxaw_cvs.bb b/meta/packages/xorg-lib/libxaw_cvs.bb
new file mode 100644
index 0000000000..2c696ceba2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxaw_cvs.bb
@@ -0,0 +1,19 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
6PROVIDES = "xaw"
7DESCRIPTION = "X Athena Widgets library"
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
10S = "${WORKDIR}/Xaw"
11
12inherit autotools pkgconfig
13
14# FIXME: libXaw needs a full x11, not diet
15BROKEN = "1"
16
17do_stage () {
18 oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
19}
diff --git a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/meta/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
+++ b/meta/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
diff --git a/meta/packages/xorg-lib/libxcomposite/change-include-order.patch b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
new file mode 100644
index 0000000000..630b8818fc
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite/change-include-order.patch
@@ -0,0 +1,14 @@
1This patch makes the build use its own Xcomposite.h over rather than an
2older Xcomposite.h that might already be installed in the staging dir.
3
4--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100
5+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100
6@@ -21,7 +21,7 @@
7 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
8 # PERFORMANCE OF THIS SOFTWARE.
9
10-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
11+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
12
13 lib_LTLIBRARIES = libXcomposite.la
14
diff --git a/meta/packages/xlibs/libxcomposite_1.0.1.bb b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
index e2ca3bbc7b..a60f8d5179 100644
--- a/meta/packages/xlibs/libxcomposite_1.0.1.bb
+++ b/meta/packages/xorg-lib/libxcomposite_1.0.1.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3DEPENDS = "libx11 compositeext xextensions libxfixes" 3DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
4PROVIDES = "xcomposite" 4PROVIDES = "xcomposite"
5DESCRIPTION = "X Composite extension library." 5DESCRIPTION = "X Composite extension library."
6PR = "r1" 6PR = "r1"
diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
new file mode 100644
index 0000000000..4cab60a531
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -0,0 +1,11 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Composite extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " compositeproto virtual/libx11 libxfixes"
7PROVIDES = "xcomposite"
8
9XORG_PN = "libXcomposite"
10
11SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
new file mode 100644
index 0000000000..4cab60a531
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,11 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Composite extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " compositeproto virtual/libx11 libxfixes"
7PROVIDES = "xcomposite"
8
9XORG_PN = "libXcomposite"
10
11SRC_URI += " file://change-include-order.patch;patch=1"
diff --git a/meta/packages/xlibs/libxcomposite_cvs.bb b/meta/packages/xorg-lib/libxcomposite_cvs.bb
index 1d8b69c8c6..fd31b5dbff 100644
--- a/meta/packages/xlibs/libxcomposite_cvs.bb
+++ b/meta/packages/xorg-lib/libxcomposite_cvs.bb
@@ -1,7 +1,7 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4DEPENDS = "libx11 compositeext xextensions libxfixes" 4DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
5PROVIDES = "xcomposite" 5PROVIDES = "xcomposite"
6DESCRIPTION = "X Composite extension library." 6DESCRIPTION = "X Composite extension library."
7 7
diff --git a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
index 99cd45a7ea..99cd45a7ea 100644
--- a/meta/packages/xlibs/libxcursor-1.1.2/autofoo.patch
+++ b/meta/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
diff --git a/meta/packages/xlibs/libxcursor/autofoo.patch b/meta/packages/xorg-lib/libxcursor/autofoo.patch
index 7aa573ce13..7aa573ce13 100644
--- a/meta/packages/xlibs/libxcursor/autofoo.patch
+++ b/meta/packages/xorg-lib/libxcursor/autofoo.patch
diff --git a/meta/packages/xlibs/libxcursor_1.1.2.bb b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
index 25744c7dca..25744c7dca 100644
--- a/meta/packages/xlibs/libxcursor_1.1.2.bb
+++ b/meta/packages/xorg-lib/libxcursor_1.1.2.bb
diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
new file mode 100644
index 0000000000..2b13c4213c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Cursor library"
4LICENSE= "BSD-X"
5
6DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
7
8XORG_PN = "libXcursor"
9
10FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
new file mode 100644
index 0000000000..2b13c4213c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Cursor library"
4LICENSE= "BSD-X"
5
6DEPENDS += " libxrender libxfixes virtual/libx11 fixesproto"
7
8XORG_PN = "libXcursor"
9
10FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/meta/packages/xorg-lib/libxcursor_cvs.bb b/meta/packages/xorg-lib/libxcursor_cvs.bb
new file mode 100644
index 0000000000..5fe2334b85
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcursor_cvs.bb
@@ -0,0 +1,17 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "BSD-X"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5DESCRIPTION = "X Cursor library"
6DEPENDS = "libxfixes"
7PR = "r2"
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
10S = "${WORKDIR}/Xcursor"
11FILES_${PN} += "${libdir}/libXcursor.so"
12
13inherit autotools pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
diff --git a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/meta/packages/xlibs/libxdamage-1.0.1/autofoo.patch
+++ b/meta/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
diff --git a/meta/packages/xlibs/libxdamage/m4.patch b/meta/packages/xorg-lib/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/meta/packages/xlibs/libxdamage/m4.patch
+++ b/meta/packages/xorg-lib/libxdamage/m4.patch
diff --git a/meta/packages/xlibs/libxdamage_1.0.1.bb b/meta/packages/xorg-lib/libxdamage_1.0.1.bb
index 040e863447..a132b751c0 100644
--- a/meta/packages/xlibs/libxdamage_1.0.1.bb
+++ b/meta/packages/xorg-lib/libxdamage_1.0.1.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3DEPENDS = "libx11 damageext libxfixes xproto" 3DEPENDS = "virtual/libx11 damageext libxfixes xproto"
4PROVIDES = "xdamage" 4PROVIDES = "xdamage"
5DESCRIPTION = "X Damage extension library." 5DESCRIPTION = "X Damage extension library."
6PR = "r1" 6PR = "r1"
diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
new file mode 100644
index 0000000000..6bb9c39f60
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Damage extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
7PROVIDES = "xdamage"
8
9XORG_PN = "libXdamage"
10
diff --git a/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..6bb9c39f60
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Damage extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " virtual/libx11 damageproto libxfixes fixesproto xextproto"
7PROVIDES = "xdamage"
8
9XORG_PN = "libXdamage"
10
diff --git a/meta/packages/xlibs/libxdamage_cvs.bb b/meta/packages/xorg-lib/libxdamage_cvs.bb
index ba8a68033a..a613d0e673 100644
--- a/meta/packages/xlibs/libxdamage_cvs.bb
+++ b/meta/packages/xorg-lib/libxdamage_cvs.bb
@@ -1,7 +1,7 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4DEPENDS = "libx11 damageext libxfixes xproto" 4DEPENDS = "virtual/libx11 damageext libxfixes xproto"
5PROVIDES = "xdamage" 5PROVIDES = "xdamage"
6DESCRIPTION = "X Damage extension library." 6DESCRIPTION = "X Damage extension library."
7 7
diff --git a/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb
new file mode 100644
index 0000000000..41b772376e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.1.bb
@@ -0,0 +1,5 @@
1SECTION = "x11/libs"
2require libxdmcp_${PV}.bb
3inherit native
4DEPENDS = "xproto-native"
5PROVIDES = ""
diff --git a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb
index 8d7162b351..87db29c799 100644
--- a/meta/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/meta/packages/xorg-lib/libxdmcp-native_0.1.3.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" 2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
3include libxdmcp_${PV}.bb 3require libxdmcp_${PV}.bb
4inherit native 4inherit native
5DEPENDS = "xproto-native" 5DEPENDS = "xproto-native"
6PROVIDES = "" 6PROVIDES = ""
diff --git a/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fbbf8e9117
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
1SECTION = "x11/libs"
2PRIORITY = "optional"
3#MAINTAINER = ""
4LICENSE = "BSD-X"
5
6DEPENDS = "xproto-native util-macros-native"
7
8SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
9S = "${WORKDIR}/libXdmcp-${PV}"
10
11inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..8ab69a1d41
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
1SECTION = "x11/libs"
2PRIORITY = "optional"
3#MAINTAINER = ""
4LICENSE = "BSD-X"
5
6DEPENDS = "xproto-native util-macros-native"
7
8SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXdmcp-${PV}.tar.bz2"
9S = "${WORKDIR}/libXdmcp-${PV}"
10
11inherit native autotools pkgconfig
diff --git a/meta/packages/xlibs/libxdmcp/autofoo.patch b/meta/packages/xorg-lib/libxdmcp/autofoo.patch
index ff1a76ad04..ff1a76ad04 100644
--- a/meta/packages/xlibs/libxdmcp/autofoo.patch
+++ b/meta/packages/xorg-lib/libxdmcp/autofoo.patch
diff --git a/meta/packages/xorg-lib/libxdmcp_0.1.1.bb b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
new file mode 100644
index 0000000000..19fba1529e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.1.bb
@@ -0,0 +1,18 @@
1SECTION = "x11/libs"
2LICENSE= "MIT"
3PRIORITY = "optional"
4MAINTAINER = "Greg Gilbert <greg@treke.net>"
5DEPENDS = "xproto"
6PROVIDES = "xdmcp"
7DESCRIPTION = "X Display Manager Control Protocol library."
8PR = "r1"
9S = "${WORKDIR}/libXdmcp-${PV}"
10
11SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
12 file://autofoo.patch;patch=1"
13
14inherit autotools pkgconfig
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/xlibs/libxdmcp_0.1.3.bb b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
index aa2736cdb2..aa2736cdb2 100644
--- a/meta/packages/xlibs/libxdmcp_0.1.3.bb
+++ b/meta/packages/xorg-lib/libxdmcp_0.1.3.bb
diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..c0139498c5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Display Manager Control Protocol library."
4PRIORITY = "optional"
5
6DEPENDS += " xproto"
7PROVIDES = "xdmcp"
8
9XORG_PN = "libXdmcp"
10
diff --git a/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..c0139498c5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Display Manager Control Protocol library."
4PRIORITY = "optional"
5
6DEPENDS += " xproto"
7PROVIDES = "xdmcp"
8
9XORG_PN = "libXdmcp"
10
diff --git a/meta/packages/xorg-lib/libxdmcp_cvs.bb b/meta/packages/xorg-lib/libxdmcp_cvs.bb
new file mode 100644
index 0000000000..20b957b522
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp_cvs.bb
@@ -0,0 +1,18 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "MIT"
3PR = "r1"
4SECTION = "x11/libs"
5PRIORITY = "optional"
6MAINTAINER = "Greg Gilbert <greg@treke.net>"
7DEPENDS = "xproto"
8PROVIDES = "xdmcp"
9DESCRIPTION = "X Display Manager Control Protocol library."
10
11SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
12S = "${WORKDIR}/Xdmcp"
13
14inherit autotools pkgconfig
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..4c3a134633
--- /dev/null
+++ b/meta/packages/xorg-lib/libxevie_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
6
7XORG_PN = "libXevie"
8
diff --git a/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..4c3a134633
--- /dev/null
+++ b/meta/packages/xorg-lib/libxevie_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext evieext"
6
7XORG_PN = "libXevie"
8
diff --git a/meta/packages/xlibs/libxext-native_cvs.bb b/meta/packages/xorg-lib/libxext-native_cvs.bb
index 9294b080b7..82360db00d 100644
--- a/meta/packages/xlibs/libxext-native_cvs.bb
+++ b/meta/packages/xorg-lib/libxext-native_cvs.bb
@@ -1,6 +1,6 @@
1SECTION = "unknown" 1SECTION = "unknown"
2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" 2FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
3include libxext_${PV}.bb 3require libxext_${PV}.bb
4inherit native 4inherit native
5DEPENDS = "libx11-native xextensions-native" 5DEPENDS = "virtual/libx11-native xextensions-native"
6PROVIDES = "" 6PROVIDES = ""
diff --git a/meta/packages/xlibs/libxext/autofoo.patch b/meta/packages/xorg-lib/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/meta/packages/xlibs/libxext/autofoo.patch
+++ b/meta/packages/xorg-lib/libxext/autofoo.patch
diff --git a/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fc2061514a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Server Extension library"
4PRIORITY = "optional"
5
6DEPENDS += " xproto virtual/libx11 xextproto libxau"
7PROVIDES = "xext"
8
9XORG_PN = "libXext"
10
diff --git a/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..fc2061514a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Server Extension library"
4PRIORITY = "optional"
5
6DEPENDS += " xproto virtual/libx11 xextproto libxau"
7PROVIDES = "xext"
8
9XORG_PN = "libXext"
10
diff --git a/meta/packages/xlibs/libxext_cvs.bb b/meta/packages/xorg-lib/libxext_cvs.bb
index 0ef675ca70..101c240c5e 100644
--- a/meta/packages/xlibs/libxext_cvs.bb
+++ b/meta/packages/xorg-lib/libxext_cvs.bb
@@ -4,7 +4,7 @@ LICENSE= "MIT"
4DESCRIPTION = "X Server Extension library" 4DESCRIPTION = "X Server Extension library"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6PRIORITY = "optional" 6PRIORITY = "optional"
7DEPENDS = "xproto libx11 xextensions" 7DEPENDS = "xproto virtual/libx11 xextensions"
8PROVIDES = "xext" 8PROVIDES = "xext"
9 9
10SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" 10SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
diff --git a/meta/packages/xlibs/libxfixes/autofoo.patch b/meta/packages/xorg-lib/libxfixes/autofoo.patch
index 26803cf7f3..26803cf7f3 100644
--- a/meta/packages/xlibs/libxfixes/autofoo.patch
+++ b/meta/packages/xorg-lib/libxfixes/autofoo.patch
diff --git a/meta/packages/xlibs/libxfixes_2.0.1.bb b/meta/packages/xorg-lib/libxfixes_2.0.1.bb
index 710fa17454..ceebdfaa11 100644
--- a/meta/packages/xlibs/libxfixes_2.0.1.bb
+++ b/meta/packages/xorg-lib/libxfixes_2.0.1.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3DEPENDS = "libx11 fixesext" 3DEPENDS = "virtual/libx11 fixesext"
4DESCRIPTION = "X Fixes extension library." 4DESCRIPTION = "X Fixes extension library."
5PR = "r1" 5PR = "r1"
6 6
diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
new file mode 100644
index 0000000000..b63633dea2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Fixes extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
7
8XORG_PN = "libXfixes"
9
diff --git a/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
new file mode 100644
index 0000000000..b63633dea2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Fixes extension library."
4LICENSE= "BSD-X"
5
6DEPENDS += " virtual/libx11 xproto fixesproto xextproto"
7
8XORG_PN = "libXfixes"
9
diff --git a/meta/packages/xlibs/libxfixes_cvs.bb b/meta/packages/xorg-lib/libxfixes_cvs.bb
index 4494dc9326..92bad48eeb 100644
--- a/meta/packages/xlibs/libxfixes_cvs.bb
+++ b/meta/packages/xorg-lib/libxfixes_cvs.bb
@@ -1,7 +1,7 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE= "BSD-X" 2LICENSE= "BSD-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4DEPENDS = "libx11 fixesext" 4DEPENDS = "virtual/libx11 fixesext"
5DESCRIPTION = "X Fixes extension library." 5DESCRIPTION = "X Fixes extension library."
6 6
7SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" 7SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
diff --git a/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..93aac77f7b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
1DESCRIPTION = "X font library (used by the X server)."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4#MAINTAINER = ""
5LICENSE = "BSD-X"
6
7DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
8
9SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
10S = "${WORKDIR}/libXfont-${PV}"
11
12inherit native autotools pkgconfig
13
diff --git a/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..664f9440a4
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont-native_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
1DESCRIPTION = "X font library (used by the X server)."
2SECTION = "x11/libs"
3PRIORITY = "optional"
4#MAINTAINER = ""
5LICENSE = "BSD-X"
6
7DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native libfontenc-native xtrans-native freetype-native util-macros-native"
8
9SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXfont-${PV}.tar.bz2"
10S = "${WORKDIR}/libXfont-${PV}"
11
12inherit native autotools pkgconfig
13
diff --git a/meta/packages/xlibs/libxfont/autofoo.patch b/meta/packages/xorg-lib/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/meta/packages/xlibs/libxfont/autofoo.patch
+++ b/meta/packages/xorg-lib/libxfont/autofoo.patch
diff --git a/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
new file mode 100644
index 0000000000..90bded6fba
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont/no-scalable-crash.patch
@@ -0,0 +1,22 @@
1--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
2+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
3@@ -695,6 +695,11 @@
4 */
5 if (isscale)
6 {
7+ /* If the fontname says it is scalable, make sure that the
8+ * renderer supports OpenScalable and GetInfoScalable.
9+ */
10+ if (renderer->OpenScalable && renderer->GetInfoScalable)
11+ {
12 if (vals.values_supplied & SIZE_SPECIFY_MASK)
13 {
14 bzero((char *)&zeroVals, sizeof(zeroVals));
15@@ -794,6 +799,7 @@
16 bitmap->name.name);
17 }
18 }
19+ }
20 }
21 return TRUE;
22 }
diff --git a/meta/packages/xlibs/libxfont/scalable.patch b/meta/packages/xorg-lib/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/meta/packages/xlibs/libxfont/scalable.patch
+++ b/meta/packages/xorg-lib/libxfont/scalable.patch
diff --git a/meta/packages/xlibs/libxfont_1.4.2.bb b/meta/packages/xorg-lib/libxfont_1.4.2.bb
index 0cc45397fe..0cc45397fe 100644
--- a/meta/packages/xlibs/libxfont_1.4.2.bb
+++ b/meta/packages/xorg-lib/libxfont_1.4.2.bb
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..a3a28d6578
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
@@ -0,0 +1,15 @@
1require xorg-lib-common.inc
2
3PR = "r1"
4SRC_URI += "file://no-scalable-crash.patch;patch=1"
5
6
7DESCRIPTION = "X font library (used by the X server)."
8LICENSE= "BSD-X"
9PRIORITY = "optional"
10
11DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
12PROVIDES = "xfont"
13
14XORG_PN = "libXfont"
15
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..748a71f1ae
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,11 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X font library (used by the X server)."
4LICENSE= "BSD-X"
5PRIORITY = "optional"
6
7DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
8PROVIDES = "xfont"
9
10XORG_PN = "libXfont"
11
diff --git a/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
new file mode 100644
index 0000000000..8739822a07
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
@@ -0,0 +1,17 @@
1require xorg-lib-common.inc
2
3PR = "r1"
4
5DESCRIPTION = "X font library (used by the X server)."
6LICENSE= "BSD-X"
7PRIORITY = "optional"
8
9SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
10SRC_URI += "file://no-scalable-crash.patch;patch=1"
11
12DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc"
13PROVIDES = "xfont"
14
15XORG_PN = "libXfont"
16
17S = "${WORKDIR}/libXfont-1.2.0"
diff --git a/meta/packages/xlibs/libxfont_cvs.bb b/meta/packages/xorg-lib/libxfont_cvs.bb
index bd21e0fd12..bd21e0fd12 100644
--- a/meta/packages/xlibs/libxfont_cvs.bb
+++ b/meta/packages/xorg-lib/libxfont_cvs.bb
diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..c75278ecb0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfontcache_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
6
7XORG_PN = "libXfontcache"
8
diff --git a/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..c75278ecb0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfontcache_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxext xextproto fontcacheproto"
6
7XORG_PN = "libXfontcache"
8
diff --git a/meta/packages/xlibs/libxft/autofoo.patch b/meta/packages/xorg-lib/libxft/autofoo.patch
index 54120aa612..54120aa612 100644
--- a/meta/packages/xlibs/libxft/autofoo.patch
+++ b/meta/packages/xorg-lib/libxft/autofoo.patch
diff --git a/meta/packages/xlibs/libxft_2.1.6.bb b/meta/packages/xorg-lib/libxft_2.1.6.bb
index c3f1f74e40..a793925596 100644
--- a/meta/packages/xlibs/libxft_2.1.6.bb
+++ b/meta/packages/xorg-lib/libxft_2.1.6.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2LICENSE = "MIT-X" 2LICENSE = "MIT-X"
3DEPENDS = "libx11 xproto libxrender freetype fontconfig" 3DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
4DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." 4DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
5PROVIDES = "xft" 5PROVIDES = "xft"
6PR = "r1" 6PR = "r1"
diff --git a/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
new file mode 100644
index 0000000000..2c46849fd2
--- /dev/null
+++ b/meta/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
@@ -0,0 +1,19 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
4
5DEPENDS += " libxrender freetype fontconfig"
6PROVIDES = "xft"
7
8XORG_PN = "libXft"
9
10FILES_${PN} = ${libdir}/lib*.so.*
11FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
12 ${libdir}/*.a ${libdir}/pkgconfig \
13 ${datadir}/aclocal ${bindir} ${sbindir}
14
15python do_package() {
16 if bb.data.getVar('DEBIAN_NAMES', d, 1):
17 bb.data.setVar('PKG_${PN}', 'libxft2', d)
18 bb.build.exec_func('package_do_package', d)
19}
diff --git a/meta/packages/xlibs/libxft_cvs.bb b/meta/packages/xorg-lib/libxft_cvs.bb
index 6c1a5f5c32..38ba5a6d5c 100644
--- a/meta/packages/xlibs/libxft_cvs.bb
+++ b/meta/packages/xorg-lib/libxft_cvs.bb
@@ -1,7 +1,7 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT-X" 2LICENSE = "MIT-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4DEPENDS = "libx11 xproto libxrender freetype fontconfig" 4DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig"
5DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." 5DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
6PROVIDES = "xft" 6PROVIDES = "xft"
7 7
diff --git a/meta/packages/xlibs/libxi/autofoo.patch b/meta/packages/xorg-lib/libxi/autofoo.patch
index f1bce9ed7a..f1bce9ed7a 100644
--- a/meta/packages/xlibs/libxi/autofoo.patch
+++ b/meta/packages/xorg-lib/libxi/autofoo.patch
diff --git a/meta/packages/xlibs/libxi_6.0.1.bb b/meta/packages/xorg-lib/libxi_6.0.1.bb
index 5c44d06df3..b9958ea6ac 100644
--- a/meta/packages/xlibs/libxi_6.0.1.bb
+++ b/meta/packages/xorg-lib/libxi_6.0.1.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "X Input Extension library" 1DESCRIPTION = "X Input Extension library"
2LICENSE = "MIT-X" 2LICENSE = "MIT-X"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4DEPENDS = "xproto libx11 xextensions" 4DEPENDS = "xproto virtual/libx11 xextensions"
5PR = "r1" 5PR = "r1"
6 6
7SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ 7SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
diff --git a/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..af5e4008eb
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Input extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
6
7XORG_PN = "libXi"
8
diff --git a/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..af5e4008eb
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Input extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext inputproto"
6
7XORG_PN = "libXi"
8
diff --git a/meta/packages/xorg-lib/libxi_cvs.bb b/meta/packages/xorg-lib/libxi_cvs.bb
new file mode 100644
index 0000000000..f37c78e819
--- /dev/null
+++ b/meta/packages/xorg-lib/libxi_cvs.bb
@@ -0,0 +1,16 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT-X"
3SECTION = "x11/libs"
4DEPENDS = "xproto virtual/libx11 xextensions"
5DESCRIPTION = "X Input extension library."
6PR = "r1"
7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
9 file://autofoo.patch;patch=1"
10S = "${WORKDIR}/Xi"
11
12inherit autotools pkgconfig
13
14do_stage() {
15 autotools_stage_all
16}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
new file mode 100644
index 0000000000..eb4a6d54cf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
@@ -0,0 +1,16 @@
1DESCRIPTION = "Xinerama library"
2LICENSE = "MIT"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5MAINTAINER = "Phil Blundell <pb@handhelds.org>"
6DEPENDS = "panoramixext xproto virtual/libx11 libxext"
7PROVIDES = "xinerama"
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
10S = "${WORKDIR}/Xinerama"
11
12inherit autotools pkgconfig
13
14do_stage() {
15 autotools_stage_all
16}
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.2.bb b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
new file mode 100644
index 0000000000..429c2fc4d0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_1.0.2.bb
@@ -0,0 +1,17 @@
1LICENSE = "MIT"
2DESCRIPTION = "Xinerama library"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5MAINTAINER = "Phil Blundell <pb@handhelds.org>"
6DEPENDS = "panoramixext xproto virtual/libx11 libxext"
7PROVIDES = "xinerama"
8PR = "r1"
9
10SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
11S = "${WORKDIR}/libXinerama-${PV}"
12
13inherit autotools pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
diff --git a/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8f72c20898
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xinerama library"
4PRIORITY = "optional"
5
6DEPENDS += " virtual/libx11 libxext xextproto xineramaproto"
7PROVIDES = "xinerama"
8
9XORG_PN = "libXinerama"
10
diff --git a/meta/packages/xorg-lib/libxinerama_cvs.bb b/meta/packages/xorg-lib/libxinerama_cvs.bb
new file mode 100644
index 0000000000..5138367bbf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxinerama_cvs.bb
@@ -0,0 +1,16 @@
1DESCRIPTION = "Xinerama library"
2LICENSE = "MIT"
3SECTION = "x11/libs"
4PRIORITY = "optional"
5DEPENDS = "panoramixext xproto virtual/libx11 libxext"
6PROVIDES = "xinerama"
7PV = "0.0+cvs${SRCDATE}"
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
10S = "${WORKDIR}/Xinerama"
11
12inherit autotools pkgconfig
13
14do_stage() {
15 autotools_stage_all
16}
diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..715dcd0554
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 keyboard library"
4LICENSE= "GPL"
5PRIORITY = "optional"
6
7DEPENDS += " virtual/libx11 kbproto"
8
diff --git a/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..715dcd0554
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 keyboard library"
4LICENSE= "GPL"
5PRIORITY = "optional"
6
7DEPENDS += " virtual/libx11 kbproto"
8
diff --git a/meta/packages/xorg-lib/libxkbfile_cvs.bb b/meta/packages/xorg-lib/libxkbfile_cvs.bb
new file mode 100644
index 0000000000..336caf139a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbfile_cvs.bb
@@ -0,0 +1,15 @@
1LICENSE = "GPL"
2PV = "0.0+cvs${SRCDATE}"
3SECTION = "libs"
4PRIORITY = "optional"
5DEPENDS = "virtual/libx11"
6DESCRIPTION = "X11 keyboard library"
7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
9S = "${WORKDIR}/xkbfile"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..e094728c2f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 lbxkbui library"
4LICENSE= "GPL"
5PRIORITY = "optional"
6
7DEPENDS += " virtual/libx11 libxt libxkbfile"
8PROVIDES = "xkbui"
diff --git a/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..e094728c2f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 lbxkbui library"
4LICENSE= "GPL"
5PRIORITY = "optional"
6
7DEPENDS += " virtual/libx11 libxt libxkbfile"
8PROVIDES = "xkbui"
diff --git a/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..02df24cd9f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
@@ -0,0 +1,16 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Window System miscellaneous utility library"
4PRIORITY = "optional"
5
6DEPENDS += " libxt libxext xextproto virtual/libx11"
7PROVIDES = "xmu"
8
9XORG_PN = "libXmu"
10
11PACKAGES =+ "libxmuu libxmuu-dev"
12
13FILES_libxmuu = "${libdir}/libXmuu.so.*"
14FILES_libxmuu-dev = "${libdir}/libXmuu.so"
15
16LEAD_SONAME = "libXmu"
diff --git a/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..02df24cd9f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
@@ -0,0 +1,16 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Window System miscellaneous utility library"
4PRIORITY = "optional"
5
6DEPENDS += " libxt libxext xextproto virtual/libx11"
7PROVIDES = "xmu"
8
9XORG_PN = "libXmu"
10
11PACKAGES =+ "libxmuu libxmuu-dev"
12
13FILES_libxmuu = "${libdir}/libXmuu.so.*"
14FILES_libxmuu-dev = "${libdir}/libXmuu.so"
15
16LEAD_SONAME = "libXmu"
diff --git a/meta/packages/xlibs/libxmu_cvs.bb b/meta/packages/xorg-lib/libxmu_cvs.bb
index 500b373c32..500b373c32 100644
--- a/meta/packages/xlibs/libxmu_cvs.bb
+++ b/meta/packages/xorg-lib/libxmu_cvs.bb
diff --git a/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..fc7ecb5778
--- /dev/null
+++ b/meta/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X print extension library."
4
5DEPENDS += " virtual/libx11 libxext xextproto libxau printproto"
6
7XORG_PN = "libXp"
8
9CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
10EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/meta/packages/xorg-lib/libxp_cvs.bb b/meta/packages/xorg-lib/libxp_cvs.bb
new file mode 100644
index 0000000000..e434e089cf
--- /dev/null
+++ b/meta/packages/xorg-lib/libxp_cvs.bb
@@ -0,0 +1,18 @@
1
2LICENSE = "MIT"
3PV = "0.0+cvs${SRCDATE}"
4
5SECTION = "libs"
6DEPENDS = "virtual/libx11 libxext"
7DESCRIPTION = "X print extension library."
8
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
10S = "${WORKDIR}/Xp"
11
12inherit autotools pkgconfig
13
14CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
15
16do_stage() {
17 autotools_stage_all
18}
diff --git a/meta/packages/xlibs/libxpm/autofoo.patch b/meta/packages/xorg-lib/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/meta/packages/xlibs/libxpm/autofoo.patch
+++ b/meta/packages/xorg-lib/libxpm/autofoo.patch
diff --git a/meta/packages/xlibs/libxpm_3.5.1.bb b/meta/packages/xorg-lib/libxpm_3.5.1.bb
index 513261efd3..8447cd3630 100644
--- a/meta/packages/xlibs/libxpm_3.5.1.bb
+++ b/meta/packages/xorg-lib/libxpm_3.5.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/libs"
2LICENSE = "X-BSD" 2LICENSE = "X-BSD"
3PRIORITY = "optional" 3PRIORITY = "optional"
4MAINTAINER = "Greg Gilbert <greg@treke.net>" 4MAINTAINER = "Greg Gilbert <greg@treke.net>"
5DEPENDS = "xproto libx11" 5DEPENDS = "xproto virtual/libx11"
6PROVIDES = "xpm" 6PROVIDES = "xpm"
7DESCRIPTION = "X Pixmap library." 7DESCRIPTION = "X Pixmap library."
8PR = "r1" 8PR = "r1"
diff --git a/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
new file mode 100644
index 0000000000..3ff582a8e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
@@ -0,0 +1,13 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Pixmap library."
4PRIORITY = "optional"
5LICENSE = "X-BSD"
6
7DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
8
9XORG_PN = "libXpm"
10
11PACKAGES =+ "sxpm cxpm"
12FILES_cxpm = "${bindir}/cxpm"
13FILES_sxpm = "${bindir}/sxpm"
diff --git a/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
new file mode 100644
index 0000000000..3ff582a8e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
@@ -0,0 +1,13 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Pixmap library."
4PRIORITY = "optional"
5LICENSE = "X-BSD"
6
7DEPENDS += " xproto virtual/libx11 libxt libxext xextproto"
8
9XORG_PN = "libXpm"
10
11PACKAGES =+ "sxpm cxpm"
12FILES_cxpm = "${bindir}/cxpm"
13FILES_sxpm = "${bindir}/sxpm"
diff --git a/meta/packages/xlibs/libxpm_cvs.bb b/meta/packages/xorg-lib/libxpm_cvs.bb
index 1b46855735..4d4d534e9a 100644
--- a/meta/packages/xlibs/libxpm_cvs.bb
+++ b/meta/packages/xorg-lib/libxpm_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "X-BSD"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5MAINTAINER = "Greg Gilbert <greg@treke.net>" 5MAINTAINER = "Greg Gilbert <greg@treke.net>"
6DEPENDS = "xproto libx11" 6DEPENDS = "xproto virtual/libx11"
7PROVIDES = "xpm" 7PROVIDES = "xpm"
8DESCRIPTION = "X Pixmap library." 8DESCRIPTION = "X Pixmap library."
9PR = "r1" 9PR = "r1"
diff --git a/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..077ac40a0a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxprintapputil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxp libxprintutil printproto libxau"
6
7XORG_PN = "libXprintAppUtil"
8
diff --git a/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f965b9a2bc
--- /dev/null
+++ b/meta/packages/xorg-lib/libxprintutil_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxp libxt printproto libxau"
6
7XORG_PN = "libXprintUtil"
8
diff --git a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
index 21f6e7fd78..21f6e7fd78 100644
--- a/meta/packages/xlibs/libxrandr-1.0.2/autofoo.patch
+++ b/meta/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
diff --git a/meta/packages/xlibs/libxrandr/autofoo.patch b/meta/packages/xorg-lib/libxrandr/autofoo.patch
index 7b1db760f2..7b1db760f2 100644
--- a/meta/packages/xlibs/libxrandr/autofoo.patch
+++ b/meta/packages/xorg-lib/libxrandr/autofoo.patch
diff --git a/meta/packages/xlibs/libxrandr_1.0.2.bb b/meta/packages/xorg-lib/libxrandr_1.0.2.bb
index efd0505544..d87471af05 100644
--- a/meta/packages/xlibs/libxrandr_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxrandr_1.0.2.bb
@@ -1,6 +1,6 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2LICENSE = "BSD-X" 2LICENSE = "BSD-X"
3DEPENDS = "randrext libx11 libxrender libxext" 3DEPENDS = "randrext virtual/libx11 libxrender libxext"
4DESCRIPTION = "X Resize and Rotate extension library." 4DESCRIPTION = "X Resize and Rotate extension library."
5PR = "r1" 5PR = "r1"
6 6
diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
new file mode 100644
index 0000000000..363550fade
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Resize and Rotate extension library."
4LICENSE = "BSD-X"
5
6DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
7
8XORG_PN = "libXrandr"
9
diff --git a/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
new file mode 100644
index 0000000000..363550fade
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Resize and Rotate extension library."
4LICENSE = "BSD-X"
5
6DEPENDS += " virtual/libx11 randrproto libxext xextproto libxrender renderproto"
7
8XORG_PN = "libXrandr"
9
diff --git a/meta/packages/xorg-lib/libxrandr_cvs.bb b/meta/packages/xorg-lib/libxrandr_cvs.bb
new file mode 100644
index 0000000000..12f3b4ef38
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr_cvs.bb
@@ -0,0 +1,15 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "BSD-X"
3SECTION = "x11/libs"
4DEPENDS = "randrext virtual/libx11 libxrender libxext"
5DESCRIPTION = "X Resize and Rotate extension library."
6PR = "r1"
7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
9S = "${WORKDIR}/Xrandr"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xlibs/libxrender/autofoo.patch b/meta/packages/xorg-lib/libxrender/autofoo.patch
index eb21c766f8..eb21c766f8 100644
--- a/meta/packages/xlibs/libxrender/autofoo.patch
+++ b/meta/packages/xorg-lib/libxrender/autofoo.patch
diff --git a/meta/packages/xorg-lib/libxrender_0.8.4.bb b/meta/packages/xorg-lib/libxrender_0.8.4.bb
new file mode 100644
index 0000000000..32e1962f26
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_0.8.4.bb
@@ -0,0 +1,15 @@
1SECTION = "libs"
2DEPENDS = "renderext virtual/libx11"
3DESCRIPTION = "X Render extension library."
4LICENSE = "BSD"
5PR = "r1"
6
7SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
8 file://autofoo.patch;patch=1"
9S = "${WORKDIR}/libXrender-${PV}"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
new file mode 100644
index 0000000000..32ba95721d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Render extension library."
4LICENSE = "BSD-X"
5
6DEPENDS += " virtual/libx11 renderproto"
7
8XORG_PN = "libXrender"
9
diff --git a/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
new file mode 100644
index 0000000000..32ba95721d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Render extension library."
4LICENSE = "BSD-X"
5
6DEPENDS += " virtual/libx11 renderproto"
7
8XORG_PN = "libXrender"
9
diff --git a/meta/packages/xlibs/libxrender_cvs.bb b/meta/packages/xorg-lib/libxrender_cvs.bb
index ea6b1f4607..31a710643c 100644
--- a/meta/packages/xlibs/libxrender_cvs.bb
+++ b/meta/packages/xorg-lib/libxrender_cvs.bb
@@ -1,7 +1,7 @@
1PV = "0.0+cvs${SRCDATE}" 1PV = "0.0+cvs${SRCDATE}"
2PR = "r1" 2PR = "r1"
3SECTION = "libs" 3SECTION = "libs"
4DEPENDS = "renderext libx11" 4DEPENDS = "renderext virtual/libx11"
5DESCRIPTION = "X Render extension library." 5DESCRIPTION = "X Render extension library."
6LICENSE = "BSD" 6LICENSE = "BSD"
7 7
diff --git a/meta/packages/xorg-lib/libxres_1.0.1.bb b/meta/packages/xorg-lib/libxres_1.0.1.bb
new file mode 100644
index 0000000000..3f0d32bfe4
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_1.0.1.bb
@@ -0,0 +1,14 @@
1SECTION = "x11/libs"
2MAINTAINER = "Greg Gilbert <greg@treke.net>"
3DEPENDS = "virtual/libx11 xextensions libxext resourceext"
4PROVIDES = "xres"
5DESCRIPTION = "X Resource usage library."
6LICENSE = "X-MIT"
7SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
8S = "${WORKDIR}/libXres-${PV}"
9
10inherit autotools pkgconfig
11
12do_stage() {
13 autotools_stage_all
14}
diff --git a/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..282947e7fe
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Resource usage library."
4
5DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
6
7XORG_PN = "libXres"
8
diff --git a/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..282947e7fe
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Resource usage library."
4
5DEPENDS += " virtual/libx11 libxext xextproto resourceproto"
6
7XORG_PN = "libXres"
8
diff --git a/meta/packages/xorg-lib/libxres_cvs.bb b/meta/packages/xorg-lib/libxres_cvs.bb
new file mode 100644
index 0000000000..a457d6c14f
--- /dev/null
+++ b/meta/packages/xorg-lib/libxres_cvs.bb
@@ -0,0 +1,15 @@
1PV = "0.0+cvs${SRCDATE}"
2SECTION = "x11/libs"
3MAINTAINER = "Greg Gilbert <greg@treke.net>"
4DEPENDS = "virtual/libx11 xextensions libxext resourceext"
5PROVIDES = "xres"
6DESCRIPTION = "X Resource usage library."
7LICENSE = "X-MIT"
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
9S = "${WORKDIR}/XRes"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2f0168e2b5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
@@ -0,0 +1,13 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X screen saver extension library."
4LICENSE = "GPL"
5
6DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
7
8XORG_PN = "libXScrnSaver"
9
10PROVIDES = "libxss"
11RREPLACES = "libxss"
12
13#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..2f0168e2b5
--- /dev/null
+++ b/meta/packages/xorg-lib/libxscrnsaver_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X screen saver extension library."
4LICENSE = "GPL"
5
6DEPENDS += " virtual/libx11 libxext xextproto scrnsaverproto"
7
8XORG_PN = "libXScrnSaver"
9
10PROVIDES = "libxss"
11RREPLACES = "libxss"
12
13#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
diff --git a/meta/packages/xorg-lib/libxss_cvs.bb b/meta/packages/xorg-lib/libxss_cvs.bb
new file mode 100644
index 0000000000..614133fce7
--- /dev/null
+++ b/meta/packages/xorg-lib/libxss_cvs.bb
@@ -0,0 +1,19 @@
1LICENSE = "GPL"
2
3PV = "0.0+cvs${SRCDATE}"
4PR = "r2"
5
6SECTION = "libs"
7DEPENDS = "virtual/libx11 libxext"
8DESCRIPTION = "X screen saver extension library."
9
10SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
11S = "${WORKDIR}/Xss"
12
13inherit autotools pkgconfig
14
15#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
16
17do_stage() {
18 autotools_stage_all
19}
diff --git a/meta/packages/xlibs/libxt/autofoo.patch b/meta/packages/xorg-lib/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/meta/packages/xlibs/libxt/autofoo.patch
+++ b/meta/packages/xorg-lib/libxt/autofoo.patch
diff --git a/meta/packages/xlibs/libxt_0.1.5.bb b/meta/packages/xorg-lib/libxt_0.1.5.bb
index 00cbe9a3ad..9c31075285 100644
--- a/meta/packages/xlibs/libxt_0.1.5.bb
+++ b/meta/packages/xorg-lib/libxt_0.1.5.bb
@@ -1,7 +1,7 @@
1SECTION = "x11/libs" 1SECTION = "x11/libs"
2PRIORITY = "optional" 2PRIORITY = "optional"
3MAINTAINER = "Phil Blundell <pb@handhelds.org>" 3MAINTAINER = "Phil Blundell <pb@handhelds.org>"
4DEPENDS = "libx11 libsm" 4DEPENDS = "virtual/libx11 libsm"
5PROVIDES = "xt" 5PROVIDES = "xt"
6DESCRIPTION = "X Toolkit Intrinsics" 6DESCRIPTION = "X Toolkit Intrinsics"
7LICENSE = "X-MIT" 7LICENSE = "X-MIT"
diff --git a/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b8bbe4dea3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
@@ -0,0 +1,19 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Toolkit Intrinsics"
4PRIORITY = "optional"
5
6DEPENDS += " libsm virtual/libx11 xproto kbproto"
7PROVIDES = "xt"
8
9XORG_PN = "libXt"
10
11EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
12
13do_compile() {
14 (
15 unset CC LD CXX CCLD
16 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
17 )
18 oe_runmake
19}
diff --git a/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b8bbe4dea3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
@@ -0,0 +1,19 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Toolkit Intrinsics"
4PRIORITY = "optional"
5
6DEPENDS += " libsm virtual/libx11 xproto kbproto"
7PROVIDES = "xt"
8
9XORG_PN = "libXt"
10
11EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
12
13do_compile() {
14 (
15 unset CC LD CXX CCLD
16 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
17 )
18 oe_runmake
19}
diff --git a/meta/packages/xorg-lib/libxt_cvs.bb b/meta/packages/xorg-lib/libxt_cvs.bb
new file mode 100644
index 0000000000..3fd2eabe67
--- /dev/null
+++ b/meta/packages/xorg-lib/libxt_cvs.bb
@@ -0,0 +1,26 @@
1PV = "0.0+cvs${SRCDATE}"
2SECTION = "x11/libs"
3PRIORITY = "optional"
4DEPENDS = "virtual/libx11 libsm"
5PROVIDES = "xt"
6DESCRIPTION = "X Toolkit Intrinsics"
7LICENSE = "X-MIT"
8PR = "r1"
9SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
10S = "${WORKDIR}/Xt"
11
12inherit autotools pkgconfig
13
14
15do_compile() {
16 (
17 unset CC LD CXX CCLD
18 oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
19 )
20 oe_runmake
21}
22
23
24do_stage () {
25 autotools_stage_all
26}
diff --git a/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..f9ebac47f9
--- /dev/null
+++ b/meta/packages/xorg-lib/libxtrap_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " virtual/libx11 libxt trapproto libxext xextproto"
6
7XORG_PN = "libXTrap"
8
diff --git a/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..802ea2836d
--- /dev/null
+++ b/meta/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Test Extension: client side library"
4PRIORITY = "optional"
5
6DEPENDS += " virtual/libx11 libxext recordproto xextproto inputproto"
7PROVIDES = "xtst"
8
9XORG_PN = "libXtst"
10
diff --git a/meta/packages/xlibs/libxtst_cvs.bb b/meta/packages/xorg-lib/libxtst_cvs.bb
index c7c24d5d74..dc3e358d64 100644
--- a/meta/packages/xlibs/libxtst_cvs.bb
+++ b/meta/packages/xorg-lib/libxtst_cvs.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
2PV = "0.0+cvs${SRCDATE}" 2PV = "0.0+cvs${SRCDATE}"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5DEPENDS = "libx11 recordext libxext" 5DEPENDS = "virtual/libx11 recordext libxext"
6PROVIDES = "xtst" 6PROVIDES = "xtst"
7DESCRIPTION = "X Test Extension: client side library" 7DESCRIPTION = "X Test Extension: client side library"
8PR = "r3" 8PR = "r3"
diff --git a/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
new file mode 100644
index 0000000000..93c41ce126
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
@@ -0,0 +1,13 @@
1LICENSE = "GPL"
2SECTION = "x11/libs"
3DEPENDS = "virtual/libx11 libxext"
4DESCRIPTION = "X Video extension library."
5
6SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
7S = "${WORKDIR}/Xv"
8
9inherit autotools pkgconfig
10
11do_stage() {
12 autotools_stage_all
13}
diff --git a/meta/packages/xorg-lib/libxv_2.2.2.bb b/meta/packages/xorg-lib/libxv_2.2.2.bb
new file mode 100644
index 0000000000..d42302979e
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_2.2.2.bb
@@ -0,0 +1,13 @@
1LICENSE = "GPL"
2SECTION = "x11/libs"
3DEPENDS = "virtual/libx11 libxext"
4DESCRIPTION = "X Video extension library."
5
6SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
7S = "${WORKDIR}/libXv-${PV}"
8
9inherit autotools pkgconfig
10
11do_stage() {
12 autotools_stage_all
13}
diff --git a/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0d045940e3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Video extension library."
4LICENSE = "GPL"
5
6DEPENDS += " virtual/libx11 libxext xextproto videoproto"
7
8XORG_PN = "libXv"
9
diff --git a/meta/packages/xorg-lib/libxvmc/drm.patch b/meta/packages/xorg-lib/libxvmc/drm.patch
new file mode 100644
index 0000000000..d48cdb3d0b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/drm.patch
@@ -0,0 +1,9 @@
1--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
2+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
3@@ -1,5 +1,5 @@
4 AM_CFLAGS = $(XVMC_CFLAGS)
5-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
6+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
7
8 lib_LTLIBRARIES = libviaXvMC.la
9
diff --git a/meta/packages/xorg-lib/libxvmc/true.patch b/meta/packages/xorg-lib/libxvmc/true.patch
new file mode 100644
index 0000000000..7059295007
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/true.patch
@@ -0,0 +1,11 @@
1--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
2+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
3@@ -43,6 +43,8 @@
4 #include <xf86drm.h>
5 #include <pthread.h>
6 #include "vldXvMC.h"
7+
8+#define TRUE 1
9
10 #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
11 (((CARD8 *)(ctx)->sAreaAddress) + \
diff --git a/meta/packages/xorg-lib/libxvmc/via.patch b/meta/packages/xorg-lib/libxvmc/via.patch
new file mode 100644
index 0000000000..21cdfbdd6b
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc/via.patch
@@ -0,0 +1,23 @@
1--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
2+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
3@@ -14,4 +14,5 @@
4 AC_OUTPUT([Makefile
5 hw/Makefile
6 hw/i810/Makefile
7+ hw/via/Makefile
8 xvmc.pc])
9--- /dev/null 2004-06-13 02:32:19.000000000 +0100
10+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
11@@ -0,0 +1,7 @@
12+AM_CFLAGS = $(XVMC_CFLAGS)
13+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
14+
15+lib_LTLIBRARIES = libviaXvMC.la
16+
17+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
18+ viaXvMCPriv.h
19--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
20+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
21@@ -1 +1 @@
22-SUBDIRS = i810
23+SUBDIRS = i810 via
diff --git a/meta/packages/xorg-lib/libxvmc_20040919.bb b/meta/packages/xorg-lib/libxvmc_20040919.bb
new file mode 100644
index 0000000000..f256211962
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20040919.bb
@@ -0,0 +1,39 @@
1DESCRIPTION = "X Video Motion Compensation extension library."
2SECTION = "x11/libs"
3DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
4PR = "r2"
5
6SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
7 cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
8 file://via.patch;patch=1 \
9 file://true.patch"
10S = "${WORKDIR}/XvMC"
11
12CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
13
14# this one is for via only atm.
15COMPATIBLE_HOST = 'i.86.*-linux'
16
17inherit autotools pkgconfig
18
19do_configure_prepend() {
20 install -d ${S}/hw/via
21 cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
22 ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
23}
24
25do_compile() {
26 oe_runmake
27 oe_runmake -C hw/via
28}
29
30do_stage() {
31 oe_runmake install prefix=${STAGING_DIR} \
32 bindir=${STAGING_BINDIR} \
33 includedir=${STAGING_INCDIR} \
34 libdir=${STAGING_LIBDIR} \
35 datadir=${STAGING_DATADIR} \
36 mandir=${STAGING_DATADIR}/man
37 oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
38 install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
39}
diff --git a/meta/packages/xorg-lib/libxvmc_20041025.bb b/meta/packages/xorg-lib/libxvmc_20041025.bb
new file mode 100644
index 0000000000..ff8dda58a6
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20041025.bb
@@ -0,0 +1,36 @@
1DESCRIPTION = "X Video Motion Compensation extension library."
2SECTION = "x11/libs"
3DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
4PR = "r2"
5
6SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
7 file://true.patch;patch=1 file://drm.patch;patch=1"
8S = "${WORKDIR}/XvMC"
9
10CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
11
12# this one is for via only atm.
13COMPATIBLE_HOST = 'i.86.*-linux'
14
15inherit autotools pkgconfig
16
17do_compile() {
18 oe_runmake
19 oe_runmake -C hw/via
20}
21
22do_install() {
23 oe_runmake DESTDIR='${D}' install
24 oe_runmake -C hw/via DESTDIR='${D}' install
25}
26
27do_stage() {
28 oe_runmake install prefix=${STAGING_DIR} \
29 bindir=${STAGING_BINDIR} \
30 includedir=${STAGING_INCDIR} \
31 libdir=${STAGING_LIBDIR} \
32 datadir=${STAGING_DATADIR} \
33 mandir=${STAGING_DATADIR}/man
34 oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
35 install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
36}
diff --git a/meta/packages/xorg-lib/libxvmc_20050612.bb b/meta/packages/xorg-lib/libxvmc_20050612.bb
new file mode 100644
index 0000000000..d9be65baa0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_20050612.bb
@@ -0,0 +1,37 @@
1DESCRIPTION = "X Video Motion Compensation extension library."
2SECTION = "x11/libs"
3DEPENDS = "virtual/libx11 libxext libxv drm xserver-xorg"
4PR = "r0"
5
6SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
7 ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
8 file://true.patch;patch=1 file://drm.patch;patch=1"
9S = "${WORKDIR}/XvMC"
10
11CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
12
13# this one is for via only atm.
14COMPATIBLE_HOST = 'i.86.*-linux'
15
16inherit autotools pkgconfig
17
18do_compile() {
19 oe_runmake
20 oe_runmake -C hw/via
21}
22
23do_install() {
24 oe_runmake DESTDIR='${D}' install
25 oe_runmake -C hw/via DESTDIR='${D}' install
26}
27
28do_stage() {
29 oe_runmake install prefix=${STAGING_DIR} \
30 bindir=${STAGING_BINDIR} \
31 includedir=${STAGING_INCDIR} \
32 libdir=${STAGING_LIBDIR} \
33 datadir=${STAGING_DATADIR} \
34 mandir=${STAGING_DATADIR}/man
35 oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
36 install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
37}
diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a0f9f7be25
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Video Motion Compensation extension library."
4
5DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
6
7XORG_PN = "libXvMC"
8
diff --git a/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a0f9f7be25
--- /dev/null
+++ b/meta/packages/xorg-lib/libxvmc_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Video Motion Compensation extension library."
4
5DEPENDS += " virtual/libx11 libxext libxv xextproto videoproto"
6
7XORG_PN = "libXvMC"
8
diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..e067190b84
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xxf86dga extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
6
7XORG_PN = "libXxf86dga"
8
diff --git a/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..e067190b84
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xxf86dga extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86dgaproto"
6
7XORG_PN = "libXxf86dga"
8
diff --git a/meta/packages/xorg-lib/libxxf86dga_cvs.bb b/meta/packages/xorg-lib/libxxf86dga_cvs.bb
new file mode 100644
index 0000000000..d110e7e4c0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86dga_cvs.bb
@@ -0,0 +1,15 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "XFree86"
3
4SECTION = "x11/libs"
5DEPENDS = "virtual/libx11 libxext xxf86dgaext"
6DESCRIPTION = "Xxf86dga extension library."
7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
9S = "${WORKDIR}/Xxf86dga"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
15}
diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..3af4acba96
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto"
6PROVIDES = "xxf86misc"
7
8XORG_PN = "libXxf86misc"
9
diff --git a/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..3af4acba96
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
@@ -0,0 +1,9 @@
1require xorg-lib-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86miscproto"
6PROVIDES = "xxf86misc"
7
8XORG_PN = "libXxf86misc"
9
diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..b85e2d2477
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xxf86vm extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
6
7XORG_PN = "libXxf86vm"
8
diff --git a/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b85e2d2477
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "Xxf86vm extension library."
4
5DEPENDS += " xproto virtual/libx11 xextproto libxext xf86vidmodeproto"
6
7XORG_PN = "libXxf86vm"
8
diff --git a/meta/packages/xorg-lib/libxxf86vm_cvs.bb b/meta/packages/xorg-lib/libxxf86vm_cvs.bb
new file mode 100644
index 0000000000..5464c4330c
--- /dev/null
+++ b/meta/packages/xorg-lib/libxxf86vm_cvs.bb
@@ -0,0 +1,15 @@
1PV = "0.0+cvs${SRCDATE}"
2LICENSE = "MIT"
3
4SECTION = "x11/libs"
5DEPENDS = "virtual/libx11 libxext xxf86vmext"
6DESCRIPTION = "Xxf86vm extension library."
7
8SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
9S = "${WORKDIR}/Xxf86vm"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc
new file mode 100644
index 0000000000..7a3e0425c7
--- /dev/null
+++ b/meta/packages/xorg-lib/xorg-lib-common.inc
@@ -0,0 +1,17 @@
1HOMEPAGE = "http://www.x.org"
2SECTION = "x11/libs"
3#MAINTAINER = ""
4LICENSE = "MIT-X"
5
6DEPENDS = "util-macros"
7XORG_PN = "${PN}"
8SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
9S = "${WORKDIR}/${XORG_PN}-${PV}"
10
11inherit autotools pkgconfig
12
13EXTRA_OECONF="--enable-malloc0returnsnull"
14
15do_stage() {
16 autotools_stage_all
17}
diff --git a/meta/packages/xlibs/xtrans-native_0.1.bb b/meta/packages/xorg-lib/xtrans-native_0.1.bb
index 80de95c869..db1e6e4673 100644
--- a/meta/packages/xlibs/xtrans-native_0.1.bb
+++ b/meta/packages/xorg-lib/xtrans-native_0.1.bb
@@ -1,3 +1,3 @@
1SECTION = "x11/base" 1SECTION = "x11/base"
2include xtrans_${PV}.bb 2require xtrans_${PV}.bb
3inherit native 3inherit native
diff --git a/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ff63987713
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
1SECTION = "x11/libs"
2PRIORITY = "optional"
3#MAINTAINER = ""
4LICENSE = "BSD-X"
5
6DEPENDS = "util-macros-native"
7
8SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/xtrans-${PV}.tar.bz2"
9S = "${WORKDIR}/xtrans-${PV}"
10
11inherit native autotools pkgconfig
diff --git a/meta/packages/xlibs/xtrans_0.1.bb b/meta/packages/xorg-lib/xtrans_0.1.bb
index 8fee0d5089..8fee0d5089 100644
--- a/meta/packages/xlibs/xtrans_0.1.bb
+++ b/meta/packages/xorg-lib/xtrans_0.1.bb
diff --git a/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..1ab38ad838
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
@@ -0,0 +1,8 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "network API translation layer to \
4insulate X applications and libraries from OS \
5network vageries."
6
7#DEPENDS += " "
8
diff --git a/meta/packages/xlibs/xtrans_cvs.bb b/meta/packages/xorg-lib/xtrans_cvs.bb
index 9714f4017b..9714f4017b 100644
--- a/meta/packages/xlibs/xtrans_cvs.bb
+++ b/meta/packages/xorg-lib/xtrans_cvs.bb
diff --git a/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..1f4cf97e70
--- /dev/null
+++ b/meta/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,6 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..9b9cc8e472
--- /dev/null
+++ b/meta/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
7S = "${WORKDIR}/bigreqsproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..1f4cf97e70
--- /dev/null
+++ b/meta/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,6 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
new file mode 100644
index 0000000000..59eae3a0bb
--- /dev/null
+++ b/meta/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "compositeext"
diff --git a/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
new file mode 100644
index 0000000000..59eae3a0bb
--- /dev/null
+++ b/meta/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "compositeext"
diff --git a/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..a05558f979
--- /dev/null
+++ b/meta/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "damageext"
diff --git a/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
new file mode 100644
index 0000000000..16ff0441b5
--- /dev/null
+++ b/meta/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "fixesext"
diff --git a/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
new file mode 100644
index 0000000000..16ff0441b5
--- /dev/null
+++ b/meta/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "fixesext"
diff --git a/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..062c6ccbb9
--- /dev/null
+++ b/meta/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
7S = "${WORKDIR}/fontcacheproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..3c5356f0df
--- /dev/null
+++ b/meta/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
7S = "${WORKDIR}/fontsproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..c89ec23505
--- /dev/null
+++ b/meta/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
7S = "${WORKDIR}/inputproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..983730ecc0
--- /dev/null
+++ b/meta/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
7S = "${WORKDIR}/kbproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
new file mode 100644
index 0000000000..813143995d
--- /dev/null
+++ b/meta/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb
@@ -0,0 +1,8 @@
1require xorg-proto-common.inc
2
3SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2"
4S = "${WORKDIR}/${XORG_PN}-1.0.3"
5
6#DESCRIPTION = ""
7
8#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..ffdbf51ebf
--- /dev/null
+++ b/meta/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "randrext"
diff --git a/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
new file mode 100644
index 0000000000..255ab83609
--- /dev/null
+++ b/meta/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "recordext"
diff --git a/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..881eed5240
--- /dev/null
+++ b/meta/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "renderext"
diff --git a/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..231eb0b37f
--- /dev/null
+++ b/meta/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "resourceext"
diff --git a/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..af35684479
--- /dev/null
+++ b/meta/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
7S = "${WORKDIR}/xcmiscproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..0c1fda0e16
--- /dev/null
+++ b/meta/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
@@ -0,0 +1,11 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
7S = "${WORKDIR}/xextproto-${PV}"
8
9inherit native autotools pkgconfig
10
11PROVIDES = "xextensions-native"
diff --git a/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..3b35a020e4
--- /dev/null
+++ b/meta/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3PROVIDES = "xextensions"
4
5#DESCRIPTION = ""
6
7#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..3fa9c9522c
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
7S = "${WORKDIR}/xf86bigfontproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..18207c0307
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "xxf86dgaext"
diff --git a/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
new file mode 100644
index 0000000000..d3acf1f590
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7CONFLICTS = "xxf86vmext"
diff --git a/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc
new file mode 100644
index 0000000000..74e7312a50
--- /dev/null
+++ b/meta/packages/xorg-proto/xorg-proto-common.inc
@@ -0,0 +1,16 @@
1DESCRIPTION = "X protocol headers"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/libs"
4#MAINTAINER = ""
5LICENSE = "MIT-X"
6
7#DEPENDS = ""
8XORG_PN = "${PN}"
9SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz"
10S = "${WORKDIR}/${XORG_PN}-${PV}"
11
12inherit autotools pkgconfig
13
14do_stage() {
15 autotools_stage_all
16}
diff --git a/meta/packages/xproto/xproto-native_6.6.2.bb b/meta/packages/xorg-proto/xproto-native_6.6.2.bb
index 44ccb5f035..6645f592bd 100644
--- a/meta/packages/xproto/xproto-native_6.6.2.bb
+++ b/meta/packages/xorg-proto/xproto-native_6.6.2.bb
@@ -1,4 +1,4 @@
1SECTION = "unknown" 1SECTION = "unknown"
2include xproto_${PV}.bb 2require xproto_${PV}.bb
3inherit native 3inherit native
4PROVIDES = "" 4PROVIDES = ""
diff --git a/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..c197c87298
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2"
7S = "${WORKDIR}/xproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..8cec6426fd
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "X protocol headers"
2SECTION = "x11/libs"
3LICENSE= "MIT-X"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2"
7S = "${WORKDIR}/xproto-${PV}"
8
9inherit native autotools pkgconfig
diff --git a/meta/packages/xproto/xproto-native_cvs.bb b/meta/packages/xorg-proto/xproto-native_cvs.bb
index 7b768a8079..a34db98ab9 100644
--- a/meta/packages/xproto/xproto-native_cvs.bb
+++ b/meta/packages/xorg-proto/xproto-native_cvs.bb
@@ -1,4 +1,4 @@
1SECTION = "unknown" 1SECTION = "unknown"
2include xproto_cvs.bb 2require xproto_cvs.bb
3inherit native 3inherit native
4PROVIDES = "" 4PROVIDES = ""
diff --git a/meta/packages/xproto/xproto_6.6.2+cvs20050226.bb b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
index 594a351155..594a351155 100644
--- a/meta/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
diff --git a/meta/packages/xproto/xproto_6.6.2.bb b/meta/packages/xorg-proto/xproto_6.6.2.bb
index b5cf751053..b5cf751053 100644
--- a/meta/packages/xproto/xproto_6.6.2.bb
+++ b/meta/packages/xorg-proto/xproto_6.6.2.bb
diff --git a/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..d7cd7c8c86
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
@@ -0,0 +1,5 @@
1require xorg-proto-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
diff --git a/meta/packages/xproto/xproto_cvs.bb b/meta/packages/xorg-proto/xproto_cvs.bb
index 1d9c96c87d..1d9c96c87d 100644
--- a/meta/packages/xproto/xproto_cvs.bb
+++ b/meta/packages/xorg-proto/xproto_cvs.bb
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..b265a53346
--- /dev/null
+++ b/meta/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
@@ -0,0 +1,6 @@
1require xorg-proto-common.inc
2
3PROVIDES="xproxymngproto"
4#DESCRIPTION = ""
5
6#DEPENDS += " "
diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f9dc1f3d3e
--- /dev/null
+++ b/meta/packages/xorg-util/gccmakedep_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..f9dc1f3d3e
--- /dev/null
+++ b/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b2b11cf038
--- /dev/null
+++ b/meta/packages/xorg-util/imake_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3DESCRIPTION = "imake utility"
4
5DEPENDS += " perl xproto"
6
diff --git a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..b2b11cf038
--- /dev/null
+++ b/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3DESCRIPTION = "imake utility"
4
5DEPENDS += " perl xproto"
6
diff --git a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..09a7787ee3
--- /dev/null
+++ b/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto"
6
diff --git a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..1b8476be47
--- /dev/null
+++ b/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,10 @@
1require xorg-util-common.inc
2inherit native
3
4#DESCRIPTION = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2"
7S="${WORKDIR}/makedepend-${PV}"
8
9DEPENDS += " util-macros-native xproto-native"
10
diff --git a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..09a7787ee3
--- /dev/null
+++ b/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5DEPENDS += " xproto"
6
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..8696ae62f8
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
1DESCRIPTION = "X autotools macros"
2SECTION = "x11/libs"
3LICENSE= "Xorg"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/util-macros-${PV}.tar.bz2"
7S = "${WORKDIR}/util-macros-${PV}"
8
9inherit native autotools pkgconfig
10
diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..1506bd3cb2
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,10 @@
1DESCRIPTION = "X autotools macros"
2SECTION = "x11/libs"
3LICENSE= "Xorg"
4#MAINTAINER = ""
5
6SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2"
7S = "${WORKDIR}/util-macros-${PV}"
8
9inherit native autotools pkgconfig
10
diff --git a/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..4e2ddece48
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3DESCRIPTION = "X autotools macros"
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..4e2ddece48
--- /dev/null
+++ b/meta/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
1require xorg-util-common.inc
2
3DESCRIPTION = "X autotools macros"
4
5#DEPENDS += " "
6
diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..f1b6b0d4f7
--- /dev/null
+++ b/meta/packages/xorg-util/xorg-cf-files_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..f1b6b0d4f7
--- /dev/null
+++ b/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
1require xorg-util-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
new file mode 100644
index 0000000000..f00a29a21c
--- /dev/null
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -0,0 +1,15 @@
1HOMEPAGE = "http://www.x.org"
2SECTION = "x11/utils"
3#MAINTAINER = ""
4LICENSE = "MIT-X"
5
6#DEPENDS = ""
7XORG_PN = "${PN}"
8SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz"
9S = "${WORKDIR}/${XORG_PN}-${PV}"
10
11inherit autotools pkgconfig
12
13do_stage() {
14 autotools_stage_all
15}
diff --git a/meta/packages/xorg-xserver/xorg-xserver-common.inc b/meta/packages/xorg-xserver/xorg-xserver-common.inc
new file mode 100644
index 0000000000..6c1bbd34a9
--- /dev/null
+++ b/meta/packages/xorg-xserver/xorg-xserver-common.inc
@@ -0,0 +1,43 @@
1HOMEPAGE = "http://www.x.org"
2SECTION = "x11/base"
3#MAINTAINER = ""
4LICENSE = "MIT-X"
5
6RPROVIDES = "virtual/xserver"
7PROVIDES = "virtual/xserver"
8
9DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
10xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
11xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
12scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
13xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
14resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
15libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
16libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
17
18REPENDS="rgb"
19
20XORG_PN = "xorg-server"
21SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
22 file://xorg.conf"
23
24S = "${WORKDIR}/${XORG_PN}-${PV}"
25
26inherit autotools pkgconfig
27
28PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
29
30FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
31FILES_${PN}-xvfb = "${bindir}/Xvfb"
32FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
33FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 "
34FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
35
36do_stage() {
37 autotools_stage_all
38}
39
40do_install_append () {
41 install -d ${D}/etc/X11
42 install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/
43}
diff --git a/meta/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
index 0c0b64bf14..0c0b64bf14 100644
--- a/meta/packages/xserver/xserver-kdrive-omap/configure-tslib.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
diff --git a/meta/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/meta/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
diff --git a/meta/packages/xserver/xserver-kdrive-omap/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
index 22ad51c5ad..22ad51c5ad 100644
--- a/meta/packages/xserver/xserver-kdrive-omap/kmode.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
diff --git a/meta/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
index c6a23deb9d..b7e192dc76 100644
--- a/meta/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,5 +1,5 @@
1LICENSE = "MIT" 1LICENSE = "MIT"
2DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" 2DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
3PROVIDES = "virtual/xserver" 3PROVIDES = "virtual/xserver"
4PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" 4PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
5SECTION = "x11/base" 5SECTION = "x11/base"
@@ -20,7 +20,4 @@ S = "${WORKDIR}/xserver"
20inherit autotools pkgconfig 20inherit autotools pkgconfig
21 21
22EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ 22EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
23 --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr \ 23 --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
24 --enable-static=no --disable-static "
25LDFLAGS += " -lXfont -lXdmcp -lXau "
26
diff --git a/meta/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/meta/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
index 596e498b80..596e498b80 100644
--- a/meta/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
+++ b/meta/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
diff --git a/meta/packages/xserver/xserver-kdrive/devfs.patch b/meta/packages/xorg-xserver/xserver-kdrive/devfs.patch
index a6238126c0..a6238126c0 100644
--- a/meta/packages/xserver/xserver-kdrive/devfs.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/devfs.patch
diff --git a/meta/packages/xserver/xserver-kdrive/disable-apm.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
index bd8842721b..bd8842721b 100644
--- a/meta/packages/xserver/xserver-kdrive/disable-apm.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
new file mode 100644
index 0000000000..9c43e52ead
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
@@ -0,0 +1,37 @@
1--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
2+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
3@@ -505,7 +505,11 @@
4 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
5
6 dnl Core modules for most extensions, et al.
7+if test "$KDRIVE" = yes; then
8+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
9+else
10 REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
11+fi
12 REQUIRED_LIBS="xfont xau fontenc"
13
14 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
15@@ -1514,7 +1526,9 @@
16 AC_SUBST(XKB_COMPILED_DIR)
17
18 dnl and the rest of these are generic, so they're in config.h
19+if test ! x"$KDRIVE" = xyes; then
20 AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
21+fi
22 AC_DEFINE(XResExtension, 1, [Build XRes extension])
23
24 dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
25@@ -1534,10 +1548,12 @@
26
27 AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
28
29+if test ! "x$KDRIVE" = xyes ; then
30 dnl xorgconfig CLI configuration utility
31 PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
32 AC_SUBST(XORGCONFIG_DEP_CFLAGS)
33 AC_SUBST(XORGCONFIG_DEP_LIBS)
34+fi
35
36 dnl xorgcfg GUI configuration utility
37 AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch b/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
new file mode 100644
index 0000000000..13a6c2c954
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
@@ -0,0 +1,12 @@
1--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
2+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
3@@ -52,8 +52,8 @@
4 /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
5
6 #define NEED_REPLIES
7 #ifdef HAVE_DIX_CONFIG_H
8-#include <dix-config.h>
9+#include <kdrive-config.h>
10 #endif
11
12 #include <X11/X.h>
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
new file mode 100644
index 0000000000..e488657b74
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
@@ -0,0 +1,23 @@
1--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
2+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
3@@ -1438,6 +1446,10 @@
4 fi
5
6- # tslib...
7+ AC_CHECK_HEADERS([tslib.h])
8+ if test "$ac_cv_header_tslib_h" = yes; then
9+ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
10+ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
11+ fi
12
13 # damage shadow extension glx (NOTYET) fb mi
14 KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
15@@ -1467,7 +1479,7 @@
16 AC_SUBST(KDRIVE_CFLAGS)
17 AC_SUBST(KDRIVE_PURE_LIBS)
18 AC_SUBST(KDRIVE_LIBS)
19-AM_CONDITIONAL(TSLIB, false)
20+AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
21 AM_CONDITIONAL(H3600_TS, false)
22 AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
23 AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
diff --git a/meta/packages/xserver/xserver-kdrive/epson.patch b/meta/packages/xorg-xserver/xserver-kdrive/epson.patch
index 07009bdc40..07009bdc40 100644
--- a/meta/packages/xserver/xserver-kdrive/epson.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/epson.patch
diff --git a/meta/packages/xserver/xserver-kdrive/faster-rotated.patch b/meta/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
index eaf7ddec36..eaf7ddec36 100644
--- a/meta/packages/xserver/xserver-kdrive/faster-rotated.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
diff --git a/meta/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/meta/packages/xserver/xserver-kdrive/fbdev-not-fix.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
diff --git a/meta/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
index 2dc22bf50e..2dc22bf50e 100644
--- a/meta/packages/xserver/xserver-kdrive/kdrive-evdev.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
diff --git a/meta/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
index d4f885ee26..d4f885ee26 100644
--- a/meta/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
diff --git a/meta/packages/xserver/xserver-kdrive/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive/kmode.patch
index 5ad3e4e277..5ad3e4e277 100644
--- a/meta/packages/xserver/xserver-kdrive/kmode.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/kmode.patch
diff --git a/meta/packages/xserver/xserver-kdrive/no-serial-probing.patch b/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
index 35ccadaa8d..35ccadaa8d 100644
--- a/meta/packages/xserver/xserver-kdrive/no-serial-probing.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/meta/packages/xserver/xserver-kdrive/onlyfb.patch b/meta/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
index e773324981..e773324981 100644
--- a/meta/packages/xserver/xserver-kdrive/onlyfb.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
new file mode 100644
index 0000000000..d9ef51c5ba
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
@@ -0,0 +1,54 @@
1--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
2+++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
3@@ -35,6 +35,10 @@
4 XINPUT_DIR=Xi
5 endif
6
7+if XKB
8+XKB_DIR=xkb
9+endif
10+
11 if DBE
12 DBE_DIR=dbe
13 endif
14@@ -51,7 +55,7 @@
15 randr \
16 render \
17 $(XINPUT_DIR) \
18- xkb \
19+ $(XKB_DIR) \
20 $(DBE_DIR) \
21 $(MFB_DIR) \
22 $(AFB_DIR) \
23--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
24+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
25@@ -418,6 +418,7 @@
26 AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
27 AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
28 AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
29+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
30
31 dnl DDXes.
32 AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
33@@ -739,12 +740,15 @@
34
35 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
36
37-AC_DEFINE(XKB, 1, [Build XKB])
38-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
39-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
40-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
41-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
42-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
43+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
44+if test "x$XKB" = xyes; then
45+ AC_DEFINE(XKB, 1, [Build XKB])
46+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
47+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
48+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
49+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
50+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
51+fi
52
53 AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
54 [Do not have `strcasecmp'.]))
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
new file mode 100644
index 0000000000..3f8cd4ea5c
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
@@ -0,0 +1,351 @@
1--- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200
2+++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200
3@@ -385,6 +385,9 @@
4 #ifdef DMXEXT
5 extern void DMXExtensionInit(INITARGS);
6 #endif
7+#ifdef XCALIBRATE
8+extern void XCalibrateExtensionInit(INITARGS);
9+#endif
10 #ifdef XEVIE
11 extern void XevieExtensionInit(INITARGS);
12 #endif
13@@ -679,6 +682,9 @@
14 #ifdef DAMAGE
15 if (!noDamageExtension) DamageExtensionInit();
16 #endif
17+#ifdef XCALIBRATE
18+ XCalibrateExtensionInit ();
19+#endif
20 }
21
22 void
23--- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200
24+++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200
25@@ -407,6 +407,7 @@
26 AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
27 AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
28 AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
29+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes])
30 AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
31 AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
32 AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
33@@ -641,6 +642,12 @@
34 AC_DEFINE(XCSECURITY, 1, [Build Security extension])
35 fi
36
37+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
38+if test "x$XCALIBRATE" = xyes; then
39+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
40+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
41+fi
42+
43 AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
44 if test "x$XEVIE" = xyes; then
45 AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
46@@ -1466,7 +1473,7 @@
47 KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
48 KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
49 KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
50- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
51+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB"
52
53 # check if we can build Xephyr
54 PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
55--- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200
56+++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200
57@@ -22,4 +22,7 @@
58 /* Support tslib touchscreen abstraction library */
59 #undef TSLIB
60
61+/* Enable XCalibrate extension */
62+#undef XCALIBRATE
63+
64 #endif /* _KDRIVE_CONFIG_H_ */
65--- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200
66+++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200
67@@ -78,6 +78,11 @@
68 AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
69 endif
70
71+XCALIBRATE_SRCS = xcalibrate.c
72+if XCALIBRATE
73+BUILTIN_SRCS += $(XCALIBRATE_SRCS)
74+endif
75+
76 # X EVent Interception Extension: allows accessibility helpers & composite
77 # managers to intercept events from input devices and transform as needed
78 # before the clients see them.
79@@ -155,6 +160,7 @@
80 $(SCREENSAVER_SRCS) \
81 $(XCSECURITY_SRCS) \
82 $(XINERAMA_SRCS) \
83+ $(XCALIBRATE_SRCS) \
84 $(XEVIE_SRCS) \
85 $(XPRINT_SRCS) \
86 $(APPGROUP_SRCS) \
87--- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200
88+++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200
89@@ -0,0 +1,262 @@
90+/*
91+ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $
92+ *
93+ * Copyright © 2003 Philip Blundell
94+ *
95+ * Permission to use, copy, modify, distribute, and sell this software and its
96+ * documentation for any purpose is hereby granted without fee, provided that
97+ * the above copyright notice appear in all copies and that both that
98+ * copyright notice and this permission notice appear in supporting
99+ * documentation, and that the name of Philip Blundell not be used in
100+ * advertising or publicity pertaining to distribution of the software without
101+ * specific, written prior permission. Philip Blundell makes no
102+ * representations about the suitability of this software for any purpose. It
103+ * is provided "as is" without express or implied warranty.
104+ *
105+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
106+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
107+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
108+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
109+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
110+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
111+ * PERFORMANCE OF THIS SOFTWARE.
112+ */
113+
114+#ifdef HAVE_KDRIVE_CONFIG_H
115+#include <kdrive-config.h>
116+#endif
117+
118+#define NEED_EVENTS
119+#define NEED_REPLIES
120+
121+#include <X11/X.h>
122+#include <X11/Xproto.h>
123+#include "misc.h"
124+#include "os.h"
125+#include "dixstruct.h"
126+#include "extnsionst.h"
127+#include "swaprep.h"
128+
129+#include <X11/extensions/xcalibrateproto.h>
130+#include <X11/extensions/xcalibratewire.h>
131+
132+extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
133+extern void *tslib_raw_event_closure;
134+
135+static CARD8 XCalibrateReqCode;
136+int XCalibrateEventBase;
137+int XCalibrateReqBase;
138+int XCalibrateErrorBase;
139+
140+static ClientPtr xcalibrate_client;
141+
142+static void
143+xcalibrate_event_hook (int x, int y, int pressure, void *closure)
144+{
145+ ClientPtr pClient = (ClientPtr) closure;
146+ xXCalibrateRawTouchscreenEvent ev;
147+
148+ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;
149+ ev.sequenceNumber = pClient->sequence;
150+ ev.x = x;
151+ ev.y = y;
152+ ev.pressure = pressure;
153+
154+ if (!pClient->clientGone)
155+ WriteEventsToClient (pClient, 1, (xEvent *) &ev);
156+}
157+
158+static int
159+ProcXCalibrateQueryVersion (ClientPtr client)
160+{
161+ REQUEST(xXCalibrateQueryVersionReq);
162+ xXCalibrateQueryVersionReply rep;
163+ CARD16 client_major, client_minor; /* not used */
164+
165+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
166+
167+ client_major = stuff->majorVersion;
168+ client_minor = stuff->minorVersion;
169+
170+ fprintf(stderr, "%s(): called\n", __func__);
171+
172+ rep.type = X_Reply;
173+ rep.length = 0;
174+ rep.sequenceNumber = client->sequence;
175+ rep.majorVersion = XCALIBRATE_MAJOR_VERSION;
176+ rep.minorVersion = XCALIBRATE_MINOR_VERSION;
177+ if (client->swapped) {
178+ int n;
179+ swaps(&rep.sequenceNumber, n);
180+ swapl(&rep.length, n);
181+ swaps(&rep.majorVersion, n);
182+ swaps(&rep.minorVersion, n);
183+ }
184+ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
185+ return (client->noClientException);
186+}
187+
188+static int
189+SProcXCalibrateQueryVersion (ClientPtr client)
190+{
191+ REQUEST(xXCalibrateQueryVersionReq);
192+ int n;
193+
194+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
195+ swaps(&stuff->majorVersion,n);
196+ swaps(&stuff->minorVersion,n);
197+ return ProcXCalibrateQueryVersion(client);
198+}
199+
200+static int
201+ProcXCalibrateSetRawMode (ClientPtr client)
202+{
203+ REQUEST(xXCalibrateRawModeReq);
204+ xXCalibrateRawModeReply rep;
205+
206+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
207+
208+ memset (&rep, 0, sizeof (rep));
209+ rep.type = X_Reply;
210+ rep.sequenceNumber = client->sequence;
211+
212+ if (stuff->on)
213+ {
214+ if (xcalibrate_client == NULL)
215+ {
216+ /* Start calibrating. */
217+ xcalibrate_client = client;
218+ tslib_raw_event_hook = xcalibrate_event_hook;
219+ tslib_raw_event_closure = client;
220+ rep.status = GrabSuccess;
221+ }
222+ else
223+ {
224+ rep.status = AlreadyGrabbed;
225+ }
226+ }
227+ else
228+ {
229+ if (xcalibrate_client == client)
230+ {
231+ /* Stop calibrating. */
232+ xcalibrate_client = NULL;
233+ tslib_raw_event_hook = NULL;
234+ tslib_raw_event_closure = NULL;
235+ rep.status = GrabSuccess;
236+
237+ /* Cycle input off and on to reload configuration. */
238+ KdDisableInput ();
239+ KdEnableInput ();
240+ }
241+ else
242+ {
243+ rep.status = AlreadyGrabbed;
244+ }
245+ }
246+
247+ if (client->swapped)
248+ {
249+ int n;
250+
251+ swaps (&rep.sequenceNumber, n);
252+ swaps (&rep.status, n);
253+ }
254+ WriteToClient(client, sizeof (rep), (char *) &rep);
255+ return (client->noClientException);
256+}
257+
258+
259+static int
260+SProcXCalibrateSetRawMode (ClientPtr client)
261+{
262+ REQUEST(xXCalibrateRawModeReq);
263+ int n;
264+
265+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
266+
267+ swaps(&stuff->on, n);
268+
269+ return ProcXCalibrateSetRawMode(client);
270+}
271+
272+static void
273+XCalibrateResetProc (ExtensionEntry *extEntry)
274+{
275+}
276+
277+static int
278+ProcXCalibrateDispatch (ClientPtr client)
279+{
280+ REQUEST(xReq);
281+ switch (stuff->data) {
282+ case X_XCalibrateQueryVersion:
283+ return ProcXCalibrateQueryVersion(client);
284+ case X_XCalibrateRawMode:
285+ return ProcXCalibrateSetRawMode(client);
286+ default: break;
287+ }
288+
289+ return BadRequest;
290+}
291+
292+static int
293+SProcXCalibrateDispatch (ClientPtr client)
294+{
295+ REQUEST(xReq);
296+ int n;
297+
298+ swaps(&stuff->length,n);
299+
300+ switch (stuff->data) {
301+ case X_XCalibrateQueryVersion:
302+ return SProcXCalibrateQueryVersion(client);
303+ case X_XCalibrateRawMode:
304+ return SProcXCalibrateSetRawMode(client);
305+
306+ default: break;
307+ }
308+
309+ return BadRequest;
310+}
311+
312+static void
313+XCalibrateClientCallback (CallbackListPtr *list,
314+ pointer closure,
315+ pointer data)
316+{
317+ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
318+ ClientPtr pClient = clientinfo->client;
319+
320+ if (clientinfo->setup == NULL
321+ && xcalibrate_client != NULL
322+ && xcalibrate_client == pClient)
323+ {
324+ /* Stop calibrating. */
325+ xcalibrate_client = NULL;
326+ tslib_raw_event_hook = NULL;
327+ tslib_raw_event_closure = NULL;
328+ }
329+}
330+
331+void
332+XCalibrateExtensionInit(void)
333+{
334+ ExtensionEntry *extEntry;
335+
336+ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))
337+ return;
338+
339+ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
340+ ProcXCalibrateDispatch, SProcXCalibrateDispatch,
341+ XCalibrateResetProc, StandardMinorOpcode);
342+
343+ if (!extEntry)
344+ return;
345+
346+ XCalibrateReqCode = (unsigned char)extEntry->base;
347+ XCalibrateEventBase = extEntry->eventBase;
348+ XCalibrateErrorBase = extEntry->errorBase;
349+
350+ xcalibrate_client = 0;
351+}
diff --git a/meta/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/meta/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
index ce80a7e389..ce80a7e389 100644
--- a/meta/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
diff --git a/meta/packages/xserver/xserver-kdrive_20050207.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb
index 32fdb82146..c198a94de2 100644
--- a/meta/packages/xserver/xserver-kdrive_20050207.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb
@@ -3,11 +3,11 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3DEFAULT_PREFERENCE = "1" 3DEFAULT_PREFERENCE = "1"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" 6DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
7 7
8# Uncomment the following DEPENDS line and the commented line in SRC_URI 8# Uncomment the following DEPENDS line and the commented line in SRC_URI
9# to make this snapshot build against X11R7.0 xlibs. 9# to make this snapshot build against X11R7.0 xlibs.
10#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" 10#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
11 11
12PROVIDES = "virtual/xserver" 12PROVIDES = "virtual/xserver"
13RPROVIDES = "virtual/xserver" 13RPROVIDES = "virtual/xserver"
@@ -25,7 +25,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
25DESCRIPTION_xserver-kdrive-fake = "Fake X server" 25DESCRIPTION_xserver-kdrive-fake = "Fake X server"
26DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" 26DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
27 27
28PR = "r10" 28PR = "r11"
29 29
30FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" 30FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
31FILES_xserver-kdrive-ati = "${bindir}/Xati" 31FILES_xserver-kdrive-ati = "${bindir}/Xati"
diff --git a/meta/packages/xserver/xserver-kdrive_20050624.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb
index c2e44f7837..f9ba323529 100644
--- a/meta/packages/xserver/xserver-kdrive_20050624.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}"
2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" 2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3 3
4LICENSE = "MIT" 4LICENSE = "MIT"
5DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" 5DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
6PROVIDES = "virtual/xserver" 6PROVIDES = "virtual/xserver"
7RPROVIDES = "virtual/xserver" 7RPROVIDES = "virtual/xserver"
8PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" 8PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/meta/packages/xserver/xserver-kdrive_20060312.bb b/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb
index e5101a3579..594b6d74ec 100644
--- a/meta/packages/xserver/xserver-kdrive_20060312.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3DEFAULT_PREFERENCE = "1" 3DEFAULT_PREFERENCE = "1"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" 6DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
7PROVIDES = "virtual/xserver" 7PROVIDES = "virtual/xserver"
8RPROVIDES = "virtual/xserver" 8RPROVIDES = "virtual/xserver"
9PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" 9PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..cfb1294c09
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -0,0 +1,46 @@
1LICENSE = "MIT"
2DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
3
4PROVIDES = "virtual/xserver"
5RPROVIDES = "virtual/xserver"
6PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
7SECTION = "x11/base"
8DESCRIPTION = "X server from freedesktop.org"
9DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
10DESCRIPTION_xserver-kdrive-fake = "Fake X server"
11DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
12
13FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
14FILES_xserver-kdrive-fake = "${bindir}/Xfake"
15FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
16
17SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
18 file://kmode.patch;patch=1 \
19 file://disable-apm.patch;patch=1 \
20 file://no-serial-probing.patch;patch=1 \
21 file://kdrive-evdev.patch;patch=1 \
22 file://kdrive-use-evdev.patch;patch=1 \
23 file://fbdev-not-fix.patch;patch=1 \
24 file://enable-builtin-fonts.patch;patch=1 \
25 file://optional-xkb.patch;patch=1 \
26 file://disable-xf86-dga-xorgcfg.patch;patch=1 \
27 file://enable-tslib.patch;patch=1 \
28 file://xcalibrate.patch;patch=1"
29
30SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
31SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
32PACKAGE_ARCH_poodle = "poodle"
33
34S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
35
36inherit autotools pkgconfig
37
38EXTRA_OECONF = "--enable-composite --enable-kdrive \
39 --disable-dga --disable-dri --disable-xinerama \
40 --disable-xf86misc --disable-xf86vidmode \
41 --disable-xorg --disable-xorgcfg \
42 --disable-dmx \
43 --disable-xkb --disable-xnest --disable-xvfb \
44 --disable-xevie --disable-xprint --disable-xtrap \
45 --with-default-font-path=built-ins \
46 ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/meta/packages/xserver/xserver-kdrive_cvs.bb b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb
index f034fbfd73..c2b25973fb 100644
--- a/meta/packages/xserver/xserver-kdrive_cvs.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
2DEFAULT_PREFERENCE = "-2" 2DEFAULT_PREFERENCE = "-2"
3 3
4LICENSE = "MIT" 4LICENSE = "MIT"
5DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" 5DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
6PROVIDES = "virtual/xserver" 6PROVIDES = "virtual/xserver"
7RPROVIDES = "virtual/xserver" 7RPROVIDES = "virtual/xserver"
8PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" 8PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
@@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
19DESCRIPTION_xserver-kdrive-fake = "Fake X server" 19DESCRIPTION_xserver-kdrive-fake = "Fake X server"
20DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" 20DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
21 21
22PR = "r10" 22PR = "r11"
23 23
24FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" 24FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
25FILES_xserver-kdrive-ati = "${bindir}/Xati" 25FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -34,6 +34,10 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
34 34
35SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ 35SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
36 file://kmode.patch;patch=1 \ 36 file://kmode.patch;patch=1 \
37 file://disable-apm.patch;patch=1 \
38 file://no-serial-probing.patch;patch=1 \
39 file://kdrive-evdev.patch;patch=1 \
40 file://kdrive-use-evdev.patch;patch=1 \
37 file://fbdev-not-fix.patch;patch=1" 41 file://fbdev-not-fix.patch;patch=1"
38 42
39SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" 43SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_git.bb b/meta/packages/xorg-xserver/xserver-kdrive_git.bb
new file mode 100644
index 0000000000..491e486b3d
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -0,0 +1,48 @@
1PV = "1.1.0+git${SRCDATE}"
2DEFAULT_PREFERENCE = "-2"
3
4LICENSE = "MIT"
5DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
6
7PROVIDES = "virtual/xserver"
8RPROVIDES = "virtual/xserver"
9PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
10SECTION = "x11/base"
11DESCRIPTION = "X server from freedesktop.org"
12DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
13DESCRIPTION_xserver-kdrive-fake = "Fake X server"
14DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
15
16FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
17FILES_xserver-kdrive-fake = "${bindir}/Xfake"
18FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
19
20SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
21 file://kmode.patch;patch=1 \
22 file://disable-apm.patch;patch=1 \
23 file://no-serial-probing.patch;patch=1 \
24 file://kdrive-evdev.patch;patch=1 \
25 file://kdrive-use-evdev.patch;patch=1 \
26 file://fbdev-not-fix.patch;patch=1 \
27 file://enable-builtin-fonts.patch;patch=1 \
28 file://optional-xkb.patch;patch=1 \
29# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
30 file://enable-tslib.patch;patch=1"
31
32SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
33SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
34PACKAGE_ARCH_poodle = "poodle"
35
36S = "${WORKDIR}/git"
37
38inherit autotools pkgconfig
39
40EXTRA_OECONF = "--enable-composite --enable-kdrive \
41 --disable-dga --disable-dri --disable-xinerama \
42 --disable-xf86misc --disable-xf86vidmode \
43 --disable-xorg --disable-xorgcfg \
44 --disable-xkb --disable-xnest --disable-xvfb \
45 --disable-xevie --disable-xprint --disable-xtrap \
46 --disable-dmx \
47 --with-default-font-path=built-ins \
48 ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/meta/packages/xserver/xserver-xorg/dri.patch b/meta/packages/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4..37d0407fe4 100644
--- a/meta/packages/xserver/xserver-xorg/dri.patch
+++ b/meta/packages/xorg-xserver/xserver-xorg/dri.patch
diff --git a/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch
new file mode 100644
index 0000000000..04b0c1ae4f
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/drmfix.patch
@@ -0,0 +1,13 @@
1Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
2===================================================================
3--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
4+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
5@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
6
7 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
8
9-INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
10+INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
11
12 # FIXME: These need to be added to the build
13 LNX_EXTRA_SOURCES = \
diff --git a/meta/packages/xserver/xserver-xorg/fontfile.patch b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch
index ed39bf45d0..ed39bf45d0 100644
--- a/meta/packages/xserver/xserver-xorg/fontfile.patch
+++ b/meta/packages/xorg-xserver/xserver-xorg/fontfile.patch
diff --git a/meta/packages/xserver/xserver-xorg/freetype.patch b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch
index 0ba3dd5627..0ba3dd5627 100644
--- a/meta/packages/xserver/xserver-xorg/freetype.patch
+++ b/meta/packages/xorg-xserver/xserver-xorg/freetype.patch
diff --git a/meta/packages/xserver/xserver-xorg/imake-installed.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch
index 57821075ef..57821075ef 100644
--- a/meta/packages/xserver/xserver-xorg/imake-installed.patch
+++ b/meta/packages/xorg-xserver/xserver-xorg/imake-installed.patch
diff --git a/meta/packages/xserver/xserver-xorg/imake-staging.patch b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch
index bf2e350830..bf2e350830 100644
--- a/meta/packages/xserver/xserver-xorg/imake-staging.patch
+++ b/meta/packages/xorg-xserver/xserver-xorg/imake-staging.patch
diff --git a/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
new file mode 100644
index 0000000000..fbade4319a
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
@@ -0,0 +1,11 @@
1--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
2+++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
3@@ -2,7 +2,7 @@
4
5 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
6
7-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
8+INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support
9
10 liblayer_la_SOURCES = \
11 layer.h \
diff --git a/meta/packages/xorg-xserver/xserver-xorg/xorg.conf b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf
new file mode 100644
index 0000000000..34f4465764
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/xorg.conf
@@ -0,0 +1,149 @@
1
2# xorg configuration
3
4Section "ServerLayout"
5 Identifier "Default Layout"
6 Screen 0 "Screen0" 0 0
7 InputDevice "Mouse0" "CorePointer"
8 InputDevice "Keyboard0" "CoreKeyboard"
9EndSection
10
11Section "Files"
12
13# RgbPath is the location of the RGB database. Note, this is the name of the
14# file minus the extension (like ".txt" or ".db"). There is normally
15# no need to change the default.
16# Multiple FontPath entries are allowed (they are concatenated together)
17# By default, Red Hat 6.0 and later now use a font server independent of
18# the X server to render fonts.
19# FontPath "unix/:7100"
20 FontPath "/usr/lib/X11/fonts/misc"
21EndSection
22
23Section "Module"
24 Load "dbe"
25 Load "extmod"
26 Load "fbdevhw"
27# Load "glx"
28 Load "record"
29 Load "freetype"
30 Load "type1"
31# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
32# Load "z4l"
33EndSection
34
35Section "InputDevice"
36
37# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
38# Option "Xleds" "1 2 3"
39# To disable the XKEYBOARD extension, uncomment XkbDisable.
40# Option "XkbDisable"
41# To customise the XKB settings to suit your keyboard, modify the
42# lines below (which are the defaults). For example, for a non-U.S.
43# keyboard, you will probably want to use:
44# Option "XkbModel" "pc102"
45# If you have a US Microsoft Natural keyboard, you can use:
46# Option "XkbModel" "microsoft"
47#
48# Then to change the language, change the Layout setting.
49# For example, a german layout can be obtained with:
50# Option "XkbLayout" "de"
51# or:
52# Option "XkbLayout" "de"
53# Option "XkbVariant" "nodeadkeys"
54#
55# If you'd like to switch the positions of your capslock and
56# control keys, use:
57# Option "XkbOptions" "ctrl:swapcaps"
58# Or if you just want both to be control, use:
59# Option "XkbOptions" "ctrl:nocaps"
60#
61 Identifier "Keyboard0"
62 Driver "keyboard"
63 Option "XkbModel" "pc105"
64 Option "XkbLayout" "us"
65EndSection
66
67Section "InputDevice"
68 Identifier "Mouse0"
69 Driver "mouse"
70 Option "Protocol" "PS/2"
71# Option "Protocol" "IMPS/2"
72 Option "Device" "/dev/psaux"
73# Option "Device" "/dev/input/mice"
74 Option "ZAxisMapping" "4 5"
75 Option "Emulate3Buttons" "yes"
76EndSection
77
78Section "Monitor"
79 Identifier "Monitor0"
80 VendorName "Monitor Vendor"
81 ModelName "NEC FP2141SB"
82# DisplaySize 400 300
83# Note: setting HorizSync/VertRefresh will override DDC probe
84# HorizSync 30.0 - 140.0
85# VertRefresh 25.0 - 160.0
86 Option "dpms"
87EndSection
88
89Section "Monitor"
90 Identifier "Monitor1"
91 VendorName "Generic Vendor"
92 ModelName "Generic Monitor"
93 HorizSync 28-50
94 VertRefresh 43-73
95 Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628
96 Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666
97 Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync
98 Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync
99 Option "dpms"
100EndSection
101
102
103Section "Device"
104 Identifier "Videocard0"
105 Driver "s3"
106# Driver "nv"
107 VendorName "Videocard vendor"
108 BoardName "S3 driver"
109 #BoardName "NVidia driver"
110EndSection
111
112Section "Device"
113 Identifier "FBDev"
114 Driver "fbdev"
115 #Option "shadowfb" "off"
116 VideoRam 4096
117EndSection
118
119Section "Screen"
120 Identifier "Screen0"
121 Device "Videocard0"
122 Monitor "Monitor0"
123# DefaultDepth 8
124 DefaultDepth 16
125# DefaultDepth 24
126
127 SubSection "Display"
128 Depth 8
129 Modes "1024x768" "800x600" "640x480"
130 EndSubsection
131
132 SubSection "Display"
133 Depth 16
134 Modes "1024x768" "800x600" "640x480"
135 EndSubsection
136
137 SubSection "Display"
138 Depth 24
139 FbBpp 32
140 Modes "1024x768" "800x600" "640x480"
141 EndSubsection
142
143EndSection
144
145Section "DRI"
146 Group 0
147 Mode 0666
148EndSection
149
diff --git a/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
new file mode 100644
index 0000000000..17d05d3ff8
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg/xpconfig-parentdir.patch
@@ -0,0 +1,30 @@
1--- 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
2+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600
3@@ -1,6 +1,6 @@
4 xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
5
6-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
7+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
8
9 XPFONTS = \
10 AvantGarde-Book.pmf \
11--- 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
12+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600
13@@ -1,6 +1,6 @@
14 xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
15
16-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
17+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
18
19 XPFONTS = \
20 AvantGarde-Book.pmf \
21--- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600
22+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600
23@@ -1,6 +1,6 @@
24 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
25
26-parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
27+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
28
29 XPFONTS = \
30 Courier-Bold.pmf \
diff --git a/meta/packages/xserver/xserver-xorg_6.8.99.10.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
index 37546fe1ee..37546fe1ee 100644
--- a/meta/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
diff --git a/meta/packages/xserver/xserver-xorg_6.8.99.11.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
index e60f62ef57..e60f62ef57 100644
--- a/meta/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2a7ba03431
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
1require xorg-xserver-common.inc
2
3#DESCRIPTION = ""
4
5#DEPENDS += " "
6
7SRC_URI += " file://miext_layer_shadow_h.patch;patch=1 \
8 file://xpconfig-parentdir.patch;patch=1"
9
diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..3db5c640c7
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -0,0 +1,9 @@
1require xorg-xserver-common.inc
2
3SRC_URI += "file://drmfix.patch;patch=1"
4
5EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
6
7#DESCRIPTION = ""
8
9#DEPENDS += " "
diff --git a/meta/packages/xserver/xserver-xorg_cvs.bb b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb
index e410581e17..e410581e17 100644
--- a/meta/packages/xserver/xserver-xorg_cvs.bb
+++ b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb