From dd0c887b669ed5f2fdfa21118f4b32d096e92816 Mon Sep 17 00:00:00 2001 From: Raymond Danks Date: Mon, 24 Jul 2006 19:46:41 +0000 Subject: xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure. This is the first step for the update to X11R7.1. This will not build and will be followed by more patches and updates. --- packages/x11-apps/app-common.inc | 13 - packages/x11-apps/bdftopcf_1.0.0.bb | 2 - packages/x11-apps/iceauth_1.0.1.bb | 2 - packages/x11-apps/mkfontdir_1.0.1.bb | 2 - packages/x11-apps/mkfontscale_1.0.1.bb | 2 - packages/x11-apps/rgb_1.0.0.bb | 2 - packages/x11-apps/twm_1.0.1.bb | 14 - packages/x11-apps/xauth/.mtn2git_empty | 0 packages/x11-apps/xauth/autofoo.patch | 148 ------ packages/x11-apps/xauth_1.0.1.bb | 2 - packages/x11-apps/xauth_cvs.bb | 13 - packages/x11-apps/xclock_1.0.1.bb | 2 - packages/x11-apps/xeyes_1.0.1.bb | 2 - packages/x11-apps/xinit_1.0.1.bb | 2 - packages/x11-apps/xkbcomp_1.0.1.bb | 2 - packages/xdpyinfo/xdpyinfo/.mtn2git_empty | 0 packages/xdpyinfo/xdpyinfo/disable-xkb.patch | 18 - packages/xdpyinfo/xdpyinfo_1.0.1.bb | 12 - packages/xdpyinfo/xdpyinfo_cvs.bb | 12 - packages/xev/files/.mtn2git_empty | 0 packages/xev/files/diet-x11.patch | 74 --- packages/xev/xev_1.0.1.bb | 12 - packages/xev/xev_cvs.bb | 21 - packages/xfonts/imake-staging.patch | 38 -- packages/xfonts/lexer.patch | 48 -- packages/xfonts/xfonts-xorg_6.8.bb | 57 --- packages/xhost/xhost/.mtn2git_empty | 0 packages/xhost/xhost/autofoo.patch | 165 ------- packages/xhost/xhost_1.0.0.bb | 10 - packages/xhost/xhost_20040413.bb | 14 - packages/xlibs/diet-x11/.mtn2git_empty | 0 packages/xlibs/diet-x11/X18NCMSstubs.diff | 528 --------------------- packages/xlibs/diet-x11/fix-disable-xlocale.diff | 14 - .../xlibs/diet-x11/fix-utf8-wrong-define.patch | 16 - packages/xlibs/diet-x11_20050226.bb | 6 - packages/xlibs/diet-x11_6.2.1.bb | 9 - packages/xlibs/diet-x11_X11R7.0-1.0.0.bb | 15 - packages/xlibs/diet-x11_X11R7.1-1.0.1.bb | 11 - packages/xlibs/diet-x11_cvs.bb | 7 - packages/xlibs/files/.mtn2git_empty | 0 .../xlibs/files/errordb-keysymdb-path-fix.patch | 22 - packages/xlibs/files/fix-utf8-wrong-define.patch | 16 - packages/xlibs/libfontenc_1.0.1.bb | 11 - packages/xlibs/libfontenc_1.0.2.bb | 12 - packages/xlibs/libice/.mtn2git_empty | 0 packages/xlibs/libice/autofoo.patch | 21 - packages/xlibs/libice_6.3.3.bb | 18 - packages/xlibs/libice_X11R7.0-1.0.0.bb | 12 - packages/xlibs/libice_X11R7.1-1.0.1.bb | 13 - packages/xlibs/libice_cvs.bb | 17 - packages/xlibs/liblbxutil/.mtn2git_empty | 0 packages/xlibs/liblbxutil/mkg3states.patch | 51 -- packages/xlibs/liblbxutil_1.0.0.bb | 17 - packages/xlibs/liblbxutil_1.0.1.bb | 18 - packages/xlibs/libsm/.mtn2git_empty | 0 packages/xlibs/libsm/autofoo.patch | 21 - packages/xlibs/libsm_6.0.3.bb | 17 - packages/xlibs/libsm_X11R7.0-1.0.0.bb | 12 - packages/xlibs/libsm_X11R7.1-1.0.1.bb | 13 - packages/xlibs/libsm_cvs.bb | 18 - packages/xlibs/libx11-native_6.2.1.bb | 6 - packages/xlibs/libx11-native_cvs.bb | 5 - packages/xlibs/libx11/.mtn2git_empty | 0 packages/xlibs/libx11/autofoo.patch | 22 - packages/xlibs/libx11/xim.patch | 55 --- packages/xlibs/libx11_20050226.bb | 6 - packages/xlibs/libx11_6.2.1.bb | 40 -- packages/xlibs/libx11_X11R7.0-1.0.0.bb | 25 - packages/xlibs/libx11_X11R7.1-1.0.1.bb | 26 - packages/xlibs/libx11_cvs.bb | 41 -- packages/xlibs/libx11_git.bb | 32 -- packages/xlibs/libxau-native_0.1.1.bb | 6 - packages/xlibs/libxau-native_cvs.bb | 6 - packages/xlibs/libxau/.mtn2git_empty | 0 packages/xlibs/libxau/autofoo.patch | 21 - packages/xlibs/libxau_0.1.1.bb | 18 - packages/xlibs/libxau_1.0.0.bb | 13 - packages/xlibs/libxau_1.0.1.bb | 14 - packages/xlibs/libxau_cvs.bb | 18 - packages/xlibs/libxaw/.mtn2git_empty | 0 packages/xlibs/libxaw/auxdir.patch | 10 - packages/xlibs/libxaw_7.0.2.bb | 21 - packages/xlibs/libxaw_X11R7.0-1.0.1.bb | 15 - packages/xlibs/libxaw_X11R7.1-1.0.2.bb | 16 - packages/xlibs/libxaw_cvs.bb | 19 - packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty | 0 packages/xlibs/libxcomposite-1.0.1/autofoo.patch | 17 - packages/xlibs/libxcomposite/.mtn2git_empty | 0 .../xlibs/libxcomposite/change-include-order.patch | 14 - packages/xlibs/libxcomposite_1.0.1.bb | 16 - packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb | 14 - packages/xlibs/libxcomposite_X11R7.1-0.3.bb | 15 - packages/xlibs/libxcomposite_cvs.bb | 15 - packages/xlibs/libxcursor-1.1.2/.mtn2git_empty | 0 packages/xlibs/libxcursor-1.1.2/autofoo.patch | 20 - packages/xlibs/libxcursor/.mtn2git_empty | 0 packages/xlibs/libxcursor/autofoo.patch | 22 - packages/xlibs/libxcursor_1.1.2.bb | 18 - packages/xlibs/libxcursor_1.1.5.2.bb | 13 - packages/xlibs/libxcursor_1.1.6.bb | 14 - packages/xlibs/libxcursor_cvs.bb | 17 - packages/xlibs/libxdamage-1.0.1/.mtn2git_empty | 0 packages/xlibs/libxdamage-1.0.1/autofoo.patch | 17 - packages/xlibs/libxdamage/.mtn2git_empty | 0 packages/xlibs/libxdamage/m4.patch | 65 --- packages/xlibs/libxdamage_1.0.1.bb | 17 - packages/xlibs/libxdamage_1.0.2.2.bb | 11 - packages/xlibs/libxdamage_1.0.3.bb | 12 - packages/xlibs/libxdamage_cvs.bb | 16 - packages/xlibs/libxdmcp-native_0.1.1.bb | 5 - packages/xlibs/libxdmcp-native_0.1.3.bb | 6 - packages/xlibs/libxdmcp/.mtn2git_empty | 0 packages/xlibs/libxdmcp/autofoo.patch | 22 - packages/xlibs/libxdmcp_0.1.1.bb | 18 - packages/xlibs/libxdmcp_0.1.3.bb | 18 - packages/xlibs/libxdmcp_1.0.0.bb | 12 - packages/xlibs/libxdmcp_1.0.1.bb | 13 - packages/xlibs/libxdmcp_cvs.bb | 18 - packages/xlibs/libxext-native_cvs.bb | 6 - packages/xlibs/libxext/.mtn2git_empty | 0 packages/xlibs/libxext/autofoo.patch | 18 - packages/xlibs/libxext_1.0.0.bb | 15 - packages/xlibs/libxext_1.0.1.bb | 16 - packages/xlibs/libxext_cvs.bb | 16 - packages/xlibs/libxfixes/.mtn2git_empty | 0 packages/xlibs/libxfixes/autofoo.patch | 20 - packages/xlibs/libxfixes_2.0.1.bb | 15 - packages/xlibs/libxfixes_3.0.1.2.bb | 10 - packages/xlibs/libxfixes_4.0.1.bb | 11 - packages/xlibs/libxfixes_cvs.bb | 14 - packages/xlibs/libxfont/.mtn2git_empty | 0 packages/xlibs/libxfont/autofoo.patch | 18 - packages/xlibs/libxfont/scalable.patch | 27 -- packages/xlibs/libxfont_1.4.2.bb | 19 - packages/xlibs/libxfont_X11R7.0-1.0.0.bb | 12 - packages/xlibs/libxfont_X11R7.1-1.1.0.bb | 13 - packages/xlibs/libxfont_X11R7.1-1.2.0.bb | 15 - packages/xlibs/libxfont_cvs.bb | 18 - packages/xlibs/libxft/.mtn2git_empty | 0 packages/xlibs/libxft/autofoo.patch | 21 - packages/xlibs/libxft_2.1.6.bb | 27 -- packages/xlibs/libxft_2.1.8.2.bb | 22 - packages/xlibs/libxft_cvs.bb | 26 - packages/xlibs/libxi/.mtn2git_empty | 0 packages/xlibs/libxi/autofoo.patch | 12 - packages/xlibs/libxi_6.0.1.bb | 16 - packages/xlibs/libxi_X11R7.0-1.0.0.bb | 11 - packages/xlibs/libxi_X11R7.1-1.0.1.bb | 12 - packages/xlibs/libxi_cvs.bb | 16 - packages/xlibs/libxinerama_1.0.2+cvs20050505.bb | 16 - packages/xlibs/libxinerama_1.0.2.bb | 17 - packages/xlibs/libxinerama_X11R7.0-1.0.1.bb | 14 - packages/xlibs/libxinerama_cvs.bb | 16 - packages/xlibs/libxkbfile_1.0.1.bb | 11 - packages/xlibs/libxkbfile_1.0.3.bb | 12 - packages/xlibs/libxkbfile_cvs.bb | 15 - packages/xlibs/libxkbui_1.0.1.bb | 12 - packages/xlibs/libxkbui_1.0.2.bb | 13 - packages/xlibs/libxmu_1.0.0.bb | 19 - packages/xlibs/libxmu_1.0.1.bb | 20 - packages/xlibs/libxmu_cvs.bb | 21 - packages/xlibs/libxp_1.0.0.bb | 13 - packages/xlibs/libxp_cvs.bb | 18 - packages/xlibs/libxpm/.mtn2git_empty | 0 packages/xlibs/libxpm/autofoo.patch | 18 - packages/xlibs/libxpm_3.5.1.bb | 19 - packages/xlibs/libxpm_3.5.4.2.bb | 21 - packages/xlibs/libxpm_3.5.5.bb | 21 - packages/xlibs/libxpm_cvs.bb | 19 - packages/xlibs/libxrandr-1.0.2/.mtn2git_empty | 0 packages/xlibs/libxrandr-1.0.2/autofoo.patch | 20 - packages/xlibs/libxrandr/.mtn2git_empty | 0 packages/xlibs/libxrandr/autofoo.patch | 30 -- packages/xlibs/libxrandr_1.0.2.bb | 15 - packages/xlibs/libxrandr_1.1.0.2.bb | 12 - packages/xlibs/libxrandr_1.1.1.bb | 13 - packages/xlibs/libxrandr_cvs.bb | 15 - packages/xlibs/libxrender/.mtn2git_empty | 0 packages/xlibs/libxrender/autofoo.patch | 20 - packages/xlibs/libxrender_0.8.4.bb | 15 - packages/xlibs/libxrender_0.9.0.2.bb | 12 - packages/xlibs/libxrender_0.9.1.bb | 13 - packages/xlibs/libxrender_cvs.bb | 15 - packages/xlibs/libxres_1.0.1.bb | 14 - packages/xlibs/libxres_X11R7.0-1.0.0.bb | 13 - packages/xlibs/libxres_X11R7.1-1.0.1.bb | 14 - packages/xlibs/libxres_cvs.bb | 15 - packages/xlibs/libxss_1.0.1.bb | 15 - packages/xlibs/libxss_cvs.bb | 19 - packages/xlibs/libxt/.mtn2git_empty | 0 packages/xlibs/libxt/autofoo.patch | 20 - packages/xlibs/libxt_0.1.5.bb | 29 -- packages/xlibs/libxt_1.0.0.bb | 22 - packages/xlibs/libxt_1.0.2.bb | 23 - packages/xlibs/libxt_cvs.bb | 26 - packages/xlibs/libxtst_1.0.1.bb | 12 - packages/xlibs/libxtst_cvs.bb | 17 - packages/xlibs/libxv_2.2.2+cvs20040918.bb | 13 - packages/xlibs/libxv_2.2.2.bb | 13 - packages/xlibs/libxv_X11R7.0-1.0.1.bb | 12 - packages/xlibs/libxvmc/.mtn2git_empty | 0 packages/xlibs/libxvmc/drm.patch | 9 - packages/xlibs/libxvmc/true.patch | 11 - packages/xlibs/libxvmc/via.patch | 23 - packages/xlibs/libxvmc_20040919.bb | 39 -- packages/xlibs/libxvmc_20041025.bb | 36 -- packages/xlibs/libxvmc_20050612.bb | 37 -- packages/xlibs/libxxf86dga_1.0.0.bb | 15 - packages/xlibs/libxxf86dga_1.0.1.bb | 16 - packages/xlibs/libxxf86dga_cvs.bb | 15 - packages/xlibs/libxxf86misc_1.0.0.bb | 11 - packages/xlibs/libxxf86misc_1.0.1.bb | 12 - packages/xlibs/libxxf86vm_1.0.0.bb | 12 - packages/xlibs/libxxf86vm_1.0.1.bb | 13 - packages/xlibs/libxxf86vm_cvs.bb | 15 - packages/xlibs/util-macros_1.0.1.bb | 10 - packages/xlibs/util-macros_1.0.2.bb | 11 - packages/xlibs/xorg-xlibs.inc | 12 - packages/xlibs/xtrans-native_0.1.bb | 3 - packages/xlibs/xtrans_0.1.bb | 15 - packages/xlibs/xtrans_1.0.0.bb | 9 - packages/xlibs/xtrans_cvs.bb | 16 - packages/xmodmap/xmodmap/.mtn2git_empty | 0 packages/xmodmap/xmodmap/autofoo.patch | 109 ----- packages/xmodmap/xmodmap_1.0.0.bb | 11 - packages/xmodmap/xmodmap_cvs.bb | 14 - packages/xorg-app/.mtn2git_empty | 0 packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb | 2 + packages/xorg-app/iceauth_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/rgb_X11R7.0-1.0.0.bb | 2 + packages/xorg-app/twm_X11R7.0-1.0.1.bb | 14 + packages/xorg-app/xauth/.mtn2git_empty | 0 packages/xorg-app/xauth/autofoo.patch | 148 ++++++ packages/xorg-app/xauth_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/xauth_cvs.bb | 13 + packages/xorg-app/xclock_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/xdpyinfo/.mtn2git_empty | 0 packages/xorg-app/xdpyinfo/disable-xkb.patch | 18 + packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb | 12 + packages/xorg-app/xdpyinfo_cvs.bb | 12 + packages/xorg-app/xev/.mtn2git_empty | 0 packages/xorg-app/xev/diet-x11.patch | 74 +++ packages/xorg-app/xev_X11R7.0-1.0.1.bb | 12 + packages/xorg-app/xev_cvs.bb | 21 + packages/xorg-app/xeyes_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/xhost/.mtn2git_empty | 0 packages/xorg-app/xhost/autofoo.patch | 165 +++++++ packages/xorg-app/xhost_20040413.bb | 14 + packages/xorg-app/xhost_X11R7.0-1.0.0.bb | 10 + packages/xorg-app/xinit_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb | 2 + packages/xorg-app/xmodmap/.mtn2git_empty | 0 packages/xorg-app/xmodmap/autofoo.patch | 109 +++++ packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb | 11 + packages/xorg-app/xmodmap_cvs.bb | 14 + packages/xorg-app/xorg-app-common.inc | 13 + packages/xorg-app/xprop/.mtn2git_empty | 0 packages/xorg-app/xprop/autofoo.patch | 157 ++++++ packages/xorg-app/xprop_cvs.bb | 13 + packages/xorg-app/xrandr_X11R7.0-1.0.1.bb | 9 + packages/xorg-app/xrandr_cvs.bb | 10 + packages/xorg-app/xrdb/.mtn2git_empty | 0 packages/xorg-app/xrdb/autofoo.patch | 132 ++++++ packages/xorg-app/xrdb_X11R7.0-1.0.1.bb | 11 + packages/xorg-app/xrdb_cvs.bb | 13 + packages/xorg-app/xset/.mtn2git_empty | 0 packages/xorg-app/xset/autofoo.patch | 109 +++++ packages/xorg-app/xset/disable-xkb.patch | 18 + packages/xorg-app/xset_20040817.bb | 18 + packages/xorg-app/xset_X11R7.0-1.0.1.bb | 17 + packages/xorg-data/data-common.inc | 12 - packages/xorg-data/xbitmaps_1.0.1.bb | 1 - packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb | 1 + packages/xorg-data/xkbdata_1.0.1.bb | 3 - packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb | 3 + packages/xorg-data/xorg-data-common.inc | 12 + packages/xorg-font/.mtn2git_empty | 0 packages/xorg-font/files/.mtn2git_empty | 0 packages/xorg-font/files/imake-staging.patch | 38 ++ packages/xorg-font/files/lexer.patch | 48 ++ packages/xorg-font/font-alias_X11R7.0-1.0.1.bb | 4 + .../xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb | 4 + .../xorg-font/font-micro-misc_X11R7.0-1.0.0.bb | 7 + packages/xorg-font/font-util_X11R7.0-1.0.0.bb | 5 + packages/xorg-font/xfonts-xorg_6.8.bb | 57 +++ packages/xorg-font/xorg-font-common.inc | 31 ++ packages/xorg-fonts/font-alias_1.0.1.bb | 4 - packages/xorg-fonts/font-common.inc | 31 -- packages/xorg-fonts/font-cursor-misc_1.0.0.bb | 4 - packages/xorg-fonts/font-misc-misc_1.0.0.bb | 7 - packages/xorg-fonts/font-util_1.0.0.bb | 5 - packages/xorg-lib/.mtn2git_empty | 0 packages/xorg-lib/diet-x11/.mtn2git_empty | 0 packages/xorg-lib/diet-x11/X18NCMSstubs.diff | 528 +++++++++++++++++++++ .../xorg-lib/diet-x11/fix-disable-xlocale.diff | 14 + .../xorg-lib/diet-x11/fix-utf8-wrong-define.patch | 16 + packages/xorg-lib/diet-x11_20050226.bb | 6 + packages/xorg-lib/diet-x11_6.2.1.bb | 9 + packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb | 15 + packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb | 11 + packages/xorg-lib/diet-x11_cvs.bb | 7 + packages/xorg-lib/files/.mtn2git_empty | 0 .../xorg-lib/files/errordb-keysymdb-path-fix.patch | 22 + .../xorg-lib/files/fix-utf8-wrong-define.patch | 16 + packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb | 11 + packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb | 12 + packages/xorg-lib/libice/.mtn2git_empty | 0 packages/xorg-lib/libice/autofoo.patch | 21 + packages/xorg-lib/libice_6.3.3.bb | 18 + packages/xorg-lib/libice_X11R7.0-1.0.0.bb | 12 + packages/xorg-lib/libice_X11R7.1-1.0.1.bb | 13 + packages/xorg-lib/libice_cvs.bb | 17 + packages/xorg-lib/liblbxutil/.mtn2git_empty | 0 packages/xorg-lib/liblbxutil/mkg3states.patch | 51 ++ packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb | 17 + packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb | 18 + packages/xorg-lib/libsm/.mtn2git_empty | 0 packages/xorg-lib/libsm/autofoo.patch | 21 + packages/xorg-lib/libsm_6.0.3.bb | 17 + packages/xorg-lib/libsm_X11R7.0-1.0.0.bb | 12 + packages/xorg-lib/libsm_X11R7.1-1.0.1.bb | 13 + packages/xorg-lib/libsm_cvs.bb | 18 + packages/xorg-lib/libx11-native_6.2.1.bb | 6 + packages/xorg-lib/libx11-native_cvs.bb | 5 + packages/xorg-lib/libx11/.mtn2git_empty | 0 packages/xorg-lib/libx11/autofoo.patch | 22 + packages/xorg-lib/libx11/xim.patch | 55 +++ packages/xorg-lib/libx11_20050226.bb | 6 + packages/xorg-lib/libx11_6.2.1.bb | 40 ++ packages/xorg-lib/libx11_X11R7.0-1.0.0.bb | 25 + packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 26 + packages/xorg-lib/libx11_cvs.bb | 41 ++ packages/xorg-lib/libx11_git.bb | 32 ++ packages/xorg-lib/libxau-native_0.1.1.bb | 6 + packages/xorg-lib/libxau-native_cvs.bb | 6 + packages/xorg-lib/libxau/.mtn2git_empty | 0 packages/xorg-lib/libxau/autofoo.patch | 21 + packages/xorg-lib/libxau_0.1.1.bb | 18 + packages/xorg-lib/libxau_X11R7.0-1.0.0.bb | 13 + packages/xorg-lib/libxau_X11R7.1-1.0.1.bb | 14 + packages/xorg-lib/libxau_cvs.bb | 18 + packages/xorg-lib/libxaw/.mtn2git_empty | 0 packages/xorg-lib/libxaw/auxdir.patch | 10 + packages/xorg-lib/libxaw_7.0.2.bb | 21 + packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb | 15 + packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb | 16 + packages/xorg-lib/libxaw_cvs.bb | 19 + .../xorg-lib/libxcomposite-1.0.1/.mtn2git_empty | 0 .../xorg-lib/libxcomposite-1.0.1/autofoo.patch | 17 + packages/xorg-lib/libxcomposite/.mtn2git_empty | 0 .../libxcomposite/change-include-order.patch | 14 + packages/xorg-lib/libxcomposite_1.0.1.bb | 16 + packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb | 14 + packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb | 15 + packages/xorg-lib/libxcomposite_cvs.bb | 15 + packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty | 0 packages/xorg-lib/libxcursor-1.1.2/autofoo.patch | 20 + packages/xorg-lib/libxcursor/.mtn2git_empty | 0 packages/xorg-lib/libxcursor/autofoo.patch | 22 + packages/xorg-lib/libxcursor_1.1.2.bb | 18 + packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb | 13 + packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb | 14 + packages/xorg-lib/libxcursor_cvs.bb | 17 + packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty | 0 packages/xorg-lib/libxdamage-1.0.1/autofoo.patch | 17 + packages/xorg-lib/libxdamage/.mtn2git_empty | 0 packages/xorg-lib/libxdamage/m4.patch | 65 +++ packages/xorg-lib/libxdamage_1.0.1.bb | 17 + packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb | 11 + packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb | 12 + packages/xorg-lib/libxdamage_cvs.bb | 16 + packages/xorg-lib/libxdmcp-native_0.1.1.bb | 5 + packages/xorg-lib/libxdmcp-native_0.1.3.bb | 6 + packages/xorg-lib/libxdmcp/.mtn2git_empty | 0 packages/xorg-lib/libxdmcp/autofoo.patch | 22 + packages/xorg-lib/libxdmcp_0.1.1.bb | 18 + packages/xorg-lib/libxdmcp_0.1.3.bb | 18 + packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb | 12 + packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb | 13 + packages/xorg-lib/libxdmcp_cvs.bb | 18 + packages/xorg-lib/libxext-native_cvs.bb | 6 + packages/xorg-lib/libxext/.mtn2git_empty | 0 packages/xorg-lib/libxext/autofoo.patch | 18 + packages/xorg-lib/libxext_X11R7.0-1.0.0.bb | 15 + packages/xorg-lib/libxext_X11R7.1-1.0.1.bb | 16 + packages/xorg-lib/libxext_cvs.bb | 16 + packages/xorg-lib/libxfixes/.mtn2git_empty | 0 packages/xorg-lib/libxfixes/autofoo.patch | 20 + packages/xorg-lib/libxfixes_2.0.1.bb | 15 + packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb | 10 + packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb | 11 + packages/xorg-lib/libxfixes_cvs.bb | 14 + packages/xorg-lib/libxfont/.mtn2git_empty | 0 packages/xorg-lib/libxfont/autofoo.patch | 18 + packages/xorg-lib/libxfont/scalable.patch | 27 ++ packages/xorg-lib/libxfont_1.4.2.bb | 19 + packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb | 12 + packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb | 13 + packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb | 15 + packages/xorg-lib/libxfont_cvs.bb | 18 + packages/xorg-lib/libxft/.mtn2git_empty | 0 packages/xorg-lib/libxft/autofoo.patch | 21 + packages/xorg-lib/libxft_2.1.6.bb | 27 ++ packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb | 22 + packages/xorg-lib/libxft_cvs.bb | 26 + packages/xorg-lib/libxi/.mtn2git_empty | 0 packages/xorg-lib/libxi/autofoo.patch | 12 + packages/xorg-lib/libxi_6.0.1.bb | 16 + packages/xorg-lib/libxi_X11R7.0-1.0.0.bb | 11 + packages/xorg-lib/libxi_X11R7.1-1.0.1.bb | 12 + packages/xorg-lib/libxi_cvs.bb | 16 + packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb | 16 + packages/xorg-lib/libxinerama_1.0.2.bb | 17 + packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb | 14 + packages/xorg-lib/libxinerama_cvs.bb | 16 + packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb | 11 + packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb | 12 + packages/xorg-lib/libxkbfile_cvs.bb | 15 + packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb | 12 + packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb | 13 + packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb | 19 + packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb | 20 + packages/xorg-lib/libxmu_cvs.bb | 21 + packages/xorg-lib/libxp_X11R7.0-1.0.0.bb | 13 + packages/xorg-lib/libxp_cvs.bb | 18 + packages/xorg-lib/libxpm/.mtn2git_empty | 0 packages/xorg-lib/libxpm/autofoo.patch | 18 + packages/xorg-lib/libxpm_3.5.1.bb | 19 + packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb | 21 + packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb | 21 + packages/xorg-lib/libxpm_cvs.bb | 19 + packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty | 0 packages/xorg-lib/libxrandr-1.0.2/autofoo.patch | 20 + packages/xorg-lib/libxrandr/.mtn2git_empty | 0 packages/xorg-lib/libxrandr/autofoo.patch | 30 ++ packages/xorg-lib/libxrandr_1.0.2.bb | 15 + packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb | 12 + packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb | 13 + packages/xorg-lib/libxrandr_cvs.bb | 15 + packages/xorg-lib/libxrender/.mtn2git_empty | 0 packages/xorg-lib/libxrender/autofoo.patch | 20 + packages/xorg-lib/libxrender_0.8.4.bb | 15 + packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb | 12 + packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb | 13 + packages/xorg-lib/libxrender_cvs.bb | 15 + packages/xorg-lib/libxres_1.0.1.bb | 14 + packages/xorg-lib/libxres_X11R7.0-1.0.0.bb | 13 + packages/xorg-lib/libxres_X11R7.1-1.0.1.bb | 14 + packages/xorg-lib/libxres_cvs.bb | 15 + packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb | 15 + packages/xorg-lib/libxss_cvs.bb | 19 + packages/xorg-lib/libxt/.mtn2git_empty | 0 packages/xorg-lib/libxt/autofoo.patch | 20 + packages/xorg-lib/libxt_0.1.5.bb | 29 ++ packages/xorg-lib/libxt_X11R7.0-1.0.0.bb | 22 + packages/xorg-lib/libxt_X11R7.1-1.0.2.bb | 23 + packages/xorg-lib/libxt_cvs.bb | 26 + packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb | 12 + packages/xorg-lib/libxtst_cvs.bb | 17 + packages/xorg-lib/libxv_2.2.2+cvs20040918.bb | 13 + packages/xorg-lib/libxv_2.2.2.bb | 13 + packages/xorg-lib/libxv_X11R7.0-1.0.1.bb | 12 + packages/xorg-lib/libxvmc/.mtn2git_empty | 0 packages/xorg-lib/libxvmc/drm.patch | 9 + packages/xorg-lib/libxvmc/true.patch | 11 + packages/xorg-lib/libxvmc/via.patch | 23 + packages/xorg-lib/libxvmc_20040919.bb | 39 ++ packages/xorg-lib/libxvmc_20041025.bb | 36 ++ packages/xorg-lib/libxvmc_20050612.bb | 37 ++ packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb | 15 + packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb | 16 + packages/xorg-lib/libxxf86dga_cvs.bb | 15 + packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb | 11 + packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb | 12 + packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb | 12 + packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb | 13 + packages/xorg-lib/libxxf86vm_cvs.bb | 15 + packages/xorg-lib/xorg-lib-common.inc | 12 + packages/xorg-lib/xtrans-native_0.1.bb | 3 + packages/xorg-lib/xtrans_0.1.bb | 15 + packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb | 9 + packages/xorg-lib/xtrans_cvs.bb | 16 + packages/xorg-proto/.mtn2git_empty | 0 packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb | 1 + packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb | 1 + .../xorg-proto/compositeproto_X11R7.0-0.2.2.bb | 3 + .../xorg-proto/compositeproto_X11R7.1-0.3.1.bb | 3 + packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb | 3 + packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb | 1 + packages/xorg-proto/evieext_X11R7.0-1.0.2.bb | 1 + packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb | 3 + packages/xorg-proto/fixesproto_X11R7.1-4.0.bb | 3 + .../xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb | 1 + packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb | 1 + packages/xorg-proto/glproto_X11R7.0-1.4.3.bb | 1 + packages/xorg-proto/glproto_X11R7.1-1.4.7.bb | 2 + packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb | 1 + packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb | 1 + packages/xorg-proto/printproto_X11R7.0-1.0.3.bb | 1 + packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb | 3 + packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb | 3 + packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb | 3 + packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb | 3 + .../xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb | 1 + .../xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb | 2 + packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb | 1 + packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb | 1 + .../xorg-proto/windowswmproto_X11R7.0-1.0.3.bb | 1 + packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb | 1 + packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb | 3 + .../xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb | 1 + packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb | 3 + packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb | 1 + packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb | 1 + packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb | 1 + .../xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb | 3 + packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb | 1 + packages/xorg-proto/xorg-proto-common.inc | 16 + packages/xorg-proto/xproto-native_6.6.2.bb | 4 + packages/xorg-proto/xproto-native_cvs.bb | 4 + packages/xorg-proto/xproto_6.6.2+cvs20050226.bb | 13 + packages/xorg-proto/xproto_6.6.2.bb | 13 + packages/xorg-proto/xproto_X11R7.0-7.0.4.bb | 1 + packages/xorg-proto/xproto_X11R7.1-7.0.5.bb | 2 + packages/xorg-proto/xproto_cvs.bb | 15 + .../xproxymanagementprotocol_X11R7.0-1.0.2.bb | 1 + packages/xorg-util/.mtn2git_empty | 0 packages/xorg-util/util-macros_X11R7.0-1.0.1.bb | 10 + packages/xorg-util/util-macros_X11R7.1-1.0.2.bb | 11 + packages/xorg-xserver/.mtn2git_empty | 0 packages/xorg-xserver/files/.mtn2git_empty | 0 .../xorg-xserver/files/calibrate_zaurusd.patch | 12 + .../xorg-xserver/files/poodle-xmodmap-2.6.patch | 42 ++ packages/xorg-xserver/files/setDPI.sh | 92 ++++ packages/xorg-xserver/xserver-common_1.10.bb | 19 + packages/xorg-xserver/xserver-common_1.3.bb | 12 + packages/xorg-xserver/xserver-common_1.8.bb | 18 + packages/xorg-xserver/xserver-common_1.9.bb | 19 + .../xserver-kdrive-omap/.mtn2git_empty | 0 .../xserver-kdrive-omap/configure-tslib.patch | 13 + .../xserver-kdrive-omap/fbdev-not-fix.patch | 14 + .../xorg-xserver/xserver-kdrive-omap/kmode.patch | 19 + packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb | 23 + .../xorg-xserver/xserver-kdrive/.mtn2git_empty | 0 .../build-20050207-against-X11R7.diff | 464 ++++++++++++++++++ packages/xorg-xserver/xserver-kdrive/devfs.patch | 47 ++ .../xorg-xserver/xserver-kdrive/disable-apm.patch | 20 + .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 37 ++ .../xserver-kdrive/enable-builtin-fonts.patch | 12 + .../xorg-xserver/xserver-kdrive/enable-tslib.patch | 23 + packages/xorg-xserver/xserver-kdrive/epson.patch | 11 + .../xserver-kdrive/faster-rotated.patch | 241 ++++++++++ .../xserver-kdrive/fbdev-not-fix.patch | 14 + .../xorg-xserver/xserver-kdrive/kdrive-evdev.patch | 515 ++++++++++++++++++++ .../xserver-kdrive/kdrive-use-evdev.patch | 53 +++ packages/xorg-xserver/xserver-kdrive/kmode.patch | 28 ++ .../xserver-kdrive/no-serial-probing.patch | 13 + packages/xorg-xserver/xserver-kdrive/onlyfb.patch | 21 + .../xorg-xserver/xserver-kdrive/optional-xkb.patch | 54 +++ .../xorg-xserver/xserver-kdrive/xcalibrate.patch | 351 ++++++++++++++ .../xserver-kdrive/xserver-kdrive-poodle.patch | 44 ++ packages/xorg-xserver/xserver-kdrive_20050207.bb | 74 +++ packages/xorg-xserver/xserver-kdrive_20050624.bb | 49 ++ packages/xorg-xserver/xserver-kdrive_20060312.bb | 52 ++ .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 45 ++ packages/xorg-xserver/xserver-kdrive_cvs.bb | 51 ++ packages/xorg-xserver/xserver-kdrive_git.bb | 47 ++ packages/xorg-xserver/xserver-xorg/.mtn2git_empty | 0 packages/xorg-xserver/xserver-xorg/dri.patch | 10 + packages/xorg-xserver/xserver-xorg/fontfile.patch | 11 + packages/xorg-xserver/xserver-xorg/freetype.patch | 22 + .../xserver-xorg/imake-installed.patch | 11 + .../xorg-xserver/xserver-xorg/imake-staging.patch | 38 ++ packages/xorg-xserver/xserver-xorg_6.8.99.10.bb | 65 +++ packages/xorg-xserver/xserver-xorg_6.8.99.11.bb | 65 +++ packages/xorg-xserver/xserver-xorg_cvs.bb | 61 +++ packages/xprop/xprop/.mtn2git_empty | 0 packages/xprop/xprop/autofoo.patch | 157 ------ packages/xprop/xprop_cvs.bb | 13 - packages/xproto/applewmproto_1.0.3.bb | 1 - packages/xproto/bigreqsproto_1.0.2.bb | 1 - packages/xproto/compositeproto_0.2.2.bb | 3 - packages/xproto/compositeproto_0.3.1.bb | 3 - packages/xproto/damageproto_1.0.3.bb | 3 - packages/xproto/dmxproto_2.2.2.bb | 1 - packages/xproto/evieext_1.0.2.bb | 1 - packages/xproto/fixesproto_3.0.2.bb | 3 - packages/xproto/fixesproto_4.0.bb | 3 - packages/xproto/fontcacheproto_0.1.2.bb | 1 - packages/xproto/fontsproto_2.0.2.bb | 1 - packages/xproto/glproto_1.4.3.bb | 1 - packages/xproto/glproto_1.4.7.bb | 2 - packages/xproto/inputproto_1.3.2.bb | 1 - packages/xproto/kbproto_1.0.2.bb | 1 - packages/xproto/printproto_1.0.3.bb | 1 - packages/xproto/proto-common.inc | 16 - packages/xproto/randrproto_1.1.2.bb | 3 - packages/xproto/recordproto_1.13.2.bb | 3 - packages/xproto/renderproto_0.9.2.bb | 3 - packages/xproto/resourceproto_1.0.2.bb | 3 - packages/xproto/scrnsaverproto_1.0.2.bb | 1 - packages/xproto/scrnsaverproto_1.1.0.bb | 2 - packages/xproto/trapproto_3.4.3.bb | 1 - packages/xproto/videoproto_2.2.2.bb | 1 - packages/xproto/windowswmproto_1.0.3.bb | 1 - packages/xproto/xcmiscproto_1.1.2.bb | 1 - packages/xproto/xextproto_7.0.2.bb | 3 - packages/xproto/xf86bigfontproto_1.1.2.bb | 1 - packages/xproto/xf86dgaproto_2.0.2.bb | 3 - packages/xproto/xf86driproto_2.0.3.bb | 1 - packages/xproto/xf86miscproto_0.9.2.bb | 1 - packages/xproto/xf86rushproto_1.1.2.bb | 1 - packages/xproto/xf86vidmodeproto_2.2.2.bb | 3 - packages/xproto/xineramaproto_1.1.2.bb | 1 - packages/xproto/xproto-native_6.6.2.bb | 4 - packages/xproto/xproto-native_cvs.bb | 4 - packages/xproto/xproto_6.6.2+cvs20050226.bb | 13 - packages/xproto/xproto_6.6.2.bb | 13 - packages/xproto/xproto_7.0.4.bb | 1 - packages/xproto/xproto_7.0.5.bb | 2 - packages/xproto/xproto_cvs.bb | 15 - packages/xproto/xproxymanagementprotocol_1.0.2.bb | 1 - packages/xrandr/xrandr_1.0.1.bb | 9 - packages/xrandr/xrandr_cvs.bb | 10 - packages/xrdb/xrdb/.mtn2git_empty | 0 packages/xrdb/xrdb/autofoo.patch | 132 ------ packages/xrdb/xrdb_1.0.1.bb | 11 - packages/xrdb/xrdb_cvs.bb | 13 - packages/xserver-common/files/.mtn2git_empty | 0 .../xserver-common/files/calibrate_zaurusd.patch | 12 - .../xserver-common/files/poodle-xmodmap-2.6.patch | 42 -- packages/xserver-common/files/setDPI.sh | 92 ---- packages/xserver-common/xserver-common_1.10.bb | 19 - packages/xserver-common/xserver-common_1.3.bb | 12 - packages/xserver-common/xserver-common_1.8.bb | 18 - packages/xserver-common/xserver-common_1.9.bb | 19 - packages/xserver/.mtn2git_empty | 0 .../xserver/xserver-kdrive-omap/.mtn2git_empty | 0 .../xserver-kdrive-omap/configure-tslib.patch | 13 - .../xserver-kdrive-omap/fbdev-not-fix.patch | 14 - packages/xserver/xserver-kdrive-omap/kmode.patch | 19 - packages/xserver/xserver-kdrive-omap_6.6.3.bb | 23 - packages/xserver/xserver-kdrive/.mtn2git_empty | 0 .../build-20050207-against-X11R7.diff | 464 ------------------ packages/xserver/xserver-kdrive/devfs.patch | 47 -- packages/xserver/xserver-kdrive/disable-apm.patch | 20 - .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 37 -- .../xserver-kdrive/enable-builtin-fonts.patch | 12 - packages/xserver/xserver-kdrive/enable-tslib.patch | 23 - packages/xserver/xserver-kdrive/epson.patch | 11 - .../xserver/xserver-kdrive/faster-rotated.patch | 241 ---------- .../xserver/xserver-kdrive/fbdev-not-fix.patch | 14 - packages/xserver/xserver-kdrive/kdrive-evdev.patch | 515 -------------------- .../xserver/xserver-kdrive/kdrive-use-evdev.patch | 53 --- packages/xserver/xserver-kdrive/kmode.patch | 28 -- .../xserver/xserver-kdrive/no-serial-probing.patch | 13 - packages/xserver/xserver-kdrive/onlyfb.patch | 21 - packages/xserver/xserver-kdrive/optional-xkb.patch | 54 --- packages/xserver/xserver-kdrive/xcalibrate.patch | 351 -------------- .../xserver-kdrive/xserver-kdrive-poodle.patch | 44 -- packages/xserver/xserver-kdrive_20050207.bb | 74 --- packages/xserver/xserver-kdrive_20050624.bb | 49 -- packages/xserver/xserver-kdrive_20060312.bb | 52 -- packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 45 -- packages/xserver/xserver-kdrive_cvs.bb | 51 -- packages/xserver/xserver-kdrive_git.bb | 47 -- packages/xserver/xserver-xorg/.mtn2git_empty | 0 packages/xserver/xserver-xorg/dri.patch | 10 - packages/xserver/xserver-xorg/fontfile.patch | 11 - packages/xserver/xserver-xorg/freetype.patch | 22 - .../xserver/xserver-xorg/imake-installed.patch | 11 - packages/xserver/xserver-xorg/imake-staging.patch | 38 -- packages/xserver/xserver-xorg_6.8.99.10.bb | 65 --- packages/xserver/xserver-xorg_6.8.99.11.bb | 65 --- packages/xserver/xserver-xorg_cvs.bb | 61 --- packages/xset/xset/.mtn2git_empty | 0 packages/xset/xset/autofoo.patch | 109 ----- packages/xset/xset/disable-xkb.patch | 18 - packages/xset/xset_1.0.1.bb | 17 - packages/xset/xset_20040817.bb | 18 - 682 files changed, 7691 insertions(+), 7691 deletions(-) delete mode 100644 packages/x11-apps/app-common.inc delete mode 100644 packages/x11-apps/bdftopcf_1.0.0.bb delete mode 100644 packages/x11-apps/iceauth_1.0.1.bb delete mode 100644 packages/x11-apps/mkfontdir_1.0.1.bb delete mode 100644 packages/x11-apps/mkfontscale_1.0.1.bb delete mode 100644 packages/x11-apps/rgb_1.0.0.bb delete mode 100644 packages/x11-apps/twm_1.0.1.bb delete mode 100644 packages/x11-apps/xauth/.mtn2git_empty delete mode 100644 packages/x11-apps/xauth/autofoo.patch delete mode 100644 packages/x11-apps/xauth_1.0.1.bb delete mode 100644 packages/x11-apps/xauth_cvs.bb delete mode 100644 packages/x11-apps/xclock_1.0.1.bb delete mode 100644 packages/x11-apps/xeyes_1.0.1.bb delete mode 100644 packages/x11-apps/xinit_1.0.1.bb delete mode 100644 packages/x11-apps/xkbcomp_1.0.1.bb delete mode 100644 packages/xdpyinfo/xdpyinfo/.mtn2git_empty delete mode 100644 packages/xdpyinfo/xdpyinfo/disable-xkb.patch delete mode 100644 packages/xdpyinfo/xdpyinfo_1.0.1.bb delete mode 100644 packages/xdpyinfo/xdpyinfo_cvs.bb delete mode 100644 packages/xev/files/.mtn2git_empty delete mode 100644 packages/xev/files/diet-x11.patch delete mode 100644 packages/xev/xev_1.0.1.bb delete mode 100644 packages/xev/xev_cvs.bb delete mode 100644 packages/xfonts/imake-staging.patch delete mode 100644 packages/xfonts/lexer.patch delete mode 100644 packages/xfonts/xfonts-xorg_6.8.bb delete mode 100644 packages/xhost/xhost/.mtn2git_empty delete mode 100644 packages/xhost/xhost/autofoo.patch delete mode 100644 packages/xhost/xhost_1.0.0.bb delete mode 100644 packages/xhost/xhost_20040413.bb delete mode 100644 packages/xlibs/diet-x11/.mtn2git_empty delete mode 100644 packages/xlibs/diet-x11/X18NCMSstubs.diff delete mode 100644 packages/xlibs/diet-x11/fix-disable-xlocale.diff delete mode 100644 packages/xlibs/diet-x11/fix-utf8-wrong-define.patch delete mode 100644 packages/xlibs/diet-x11_20050226.bb delete mode 100644 packages/xlibs/diet-x11_6.2.1.bb delete mode 100644 packages/xlibs/diet-x11_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/diet-x11_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/diet-x11_cvs.bb delete mode 100644 packages/xlibs/files/.mtn2git_empty delete mode 100644 packages/xlibs/files/errordb-keysymdb-path-fix.patch delete mode 100644 packages/xlibs/files/fix-utf8-wrong-define.patch delete mode 100644 packages/xlibs/libfontenc_1.0.1.bb delete mode 100644 packages/xlibs/libfontenc_1.0.2.bb delete mode 100644 packages/xlibs/libice/.mtn2git_empty delete mode 100644 packages/xlibs/libice/autofoo.patch delete mode 100644 packages/xlibs/libice_6.3.3.bb delete mode 100644 packages/xlibs/libice_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libice_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/libice_cvs.bb delete mode 100644 packages/xlibs/liblbxutil/.mtn2git_empty delete mode 100644 packages/xlibs/liblbxutil/mkg3states.patch delete mode 100644 packages/xlibs/liblbxutil_1.0.0.bb delete mode 100644 packages/xlibs/liblbxutil_1.0.1.bb delete mode 100644 packages/xlibs/libsm/.mtn2git_empty delete mode 100644 packages/xlibs/libsm/autofoo.patch delete mode 100644 packages/xlibs/libsm_6.0.3.bb delete mode 100644 packages/xlibs/libsm_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libsm_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/libsm_cvs.bb delete mode 100644 packages/xlibs/libx11-native_6.2.1.bb delete mode 100644 packages/xlibs/libx11-native_cvs.bb delete mode 100644 packages/xlibs/libx11/.mtn2git_empty delete mode 100644 packages/xlibs/libx11/autofoo.patch delete mode 100644 packages/xlibs/libx11/xim.patch delete mode 100644 packages/xlibs/libx11_20050226.bb delete mode 100644 packages/xlibs/libx11_6.2.1.bb delete mode 100644 packages/xlibs/libx11_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libx11_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/libx11_cvs.bb delete mode 100644 packages/xlibs/libx11_git.bb delete mode 100644 packages/xlibs/libxau-native_0.1.1.bb delete mode 100644 packages/xlibs/libxau-native_cvs.bb delete mode 100644 packages/xlibs/libxau/.mtn2git_empty delete mode 100644 packages/xlibs/libxau/autofoo.patch delete mode 100644 packages/xlibs/libxau_0.1.1.bb delete mode 100644 packages/xlibs/libxau_1.0.0.bb delete mode 100644 packages/xlibs/libxau_1.0.1.bb delete mode 100644 packages/xlibs/libxau_cvs.bb delete mode 100644 packages/xlibs/libxaw/.mtn2git_empty delete mode 100644 packages/xlibs/libxaw/auxdir.patch delete mode 100644 packages/xlibs/libxaw_7.0.2.bb delete mode 100644 packages/xlibs/libxaw_X11R7.0-1.0.1.bb delete mode 100644 packages/xlibs/libxaw_X11R7.1-1.0.2.bb delete mode 100644 packages/xlibs/libxaw_cvs.bb delete mode 100644 packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty delete mode 100644 packages/xlibs/libxcomposite-1.0.1/autofoo.patch delete mode 100644 packages/xlibs/libxcomposite/.mtn2git_empty delete mode 100644 packages/xlibs/libxcomposite/change-include-order.patch delete mode 100644 packages/xlibs/libxcomposite_1.0.1.bb delete mode 100644 packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb delete mode 100644 packages/xlibs/libxcomposite_X11R7.1-0.3.bb delete mode 100644 packages/xlibs/libxcomposite_cvs.bb delete mode 100644 packages/xlibs/libxcursor-1.1.2/.mtn2git_empty delete mode 100644 packages/xlibs/libxcursor-1.1.2/autofoo.patch delete mode 100644 packages/xlibs/libxcursor/.mtn2git_empty delete mode 100644 packages/xlibs/libxcursor/autofoo.patch delete mode 100644 packages/xlibs/libxcursor_1.1.2.bb delete mode 100644 packages/xlibs/libxcursor_1.1.5.2.bb delete mode 100644 packages/xlibs/libxcursor_1.1.6.bb delete mode 100644 packages/xlibs/libxcursor_cvs.bb delete mode 100644 packages/xlibs/libxdamage-1.0.1/.mtn2git_empty delete mode 100644 packages/xlibs/libxdamage-1.0.1/autofoo.patch delete mode 100644 packages/xlibs/libxdamage/.mtn2git_empty delete mode 100644 packages/xlibs/libxdamage/m4.patch delete mode 100644 packages/xlibs/libxdamage_1.0.1.bb delete mode 100644 packages/xlibs/libxdamage_1.0.2.2.bb delete mode 100644 packages/xlibs/libxdamage_1.0.3.bb delete mode 100644 packages/xlibs/libxdamage_cvs.bb delete mode 100644 packages/xlibs/libxdmcp-native_0.1.1.bb delete mode 100644 packages/xlibs/libxdmcp-native_0.1.3.bb delete mode 100644 packages/xlibs/libxdmcp/.mtn2git_empty delete mode 100644 packages/xlibs/libxdmcp/autofoo.patch delete mode 100644 packages/xlibs/libxdmcp_0.1.1.bb delete mode 100644 packages/xlibs/libxdmcp_0.1.3.bb delete mode 100644 packages/xlibs/libxdmcp_1.0.0.bb delete mode 100644 packages/xlibs/libxdmcp_1.0.1.bb delete mode 100644 packages/xlibs/libxdmcp_cvs.bb delete mode 100644 packages/xlibs/libxext-native_cvs.bb delete mode 100644 packages/xlibs/libxext/.mtn2git_empty delete mode 100644 packages/xlibs/libxext/autofoo.patch delete mode 100644 packages/xlibs/libxext_1.0.0.bb delete mode 100644 packages/xlibs/libxext_1.0.1.bb delete mode 100644 packages/xlibs/libxext_cvs.bb delete mode 100644 packages/xlibs/libxfixes/.mtn2git_empty delete mode 100644 packages/xlibs/libxfixes/autofoo.patch delete mode 100644 packages/xlibs/libxfixes_2.0.1.bb delete mode 100644 packages/xlibs/libxfixes_3.0.1.2.bb delete mode 100644 packages/xlibs/libxfixes_4.0.1.bb delete mode 100644 packages/xlibs/libxfixes_cvs.bb delete mode 100644 packages/xlibs/libxfont/.mtn2git_empty delete mode 100644 packages/xlibs/libxfont/autofoo.patch delete mode 100644 packages/xlibs/libxfont/scalable.patch delete mode 100644 packages/xlibs/libxfont_1.4.2.bb delete mode 100644 packages/xlibs/libxfont_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libxfont_X11R7.1-1.1.0.bb delete mode 100644 packages/xlibs/libxfont_X11R7.1-1.2.0.bb delete mode 100644 packages/xlibs/libxfont_cvs.bb delete mode 100644 packages/xlibs/libxft/.mtn2git_empty delete mode 100644 packages/xlibs/libxft/autofoo.patch delete mode 100644 packages/xlibs/libxft_2.1.6.bb delete mode 100644 packages/xlibs/libxft_2.1.8.2.bb delete mode 100644 packages/xlibs/libxft_cvs.bb delete mode 100644 packages/xlibs/libxi/.mtn2git_empty delete mode 100644 packages/xlibs/libxi/autofoo.patch delete mode 100644 packages/xlibs/libxi_6.0.1.bb delete mode 100644 packages/xlibs/libxi_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libxi_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/libxi_cvs.bb delete mode 100644 packages/xlibs/libxinerama_1.0.2+cvs20050505.bb delete mode 100644 packages/xlibs/libxinerama_1.0.2.bb delete mode 100644 packages/xlibs/libxinerama_X11R7.0-1.0.1.bb delete mode 100644 packages/xlibs/libxinerama_cvs.bb delete mode 100644 packages/xlibs/libxkbfile_1.0.1.bb delete mode 100644 packages/xlibs/libxkbfile_1.0.3.bb delete mode 100644 packages/xlibs/libxkbfile_cvs.bb delete mode 100644 packages/xlibs/libxkbui_1.0.1.bb delete mode 100644 packages/xlibs/libxkbui_1.0.2.bb delete mode 100644 packages/xlibs/libxmu_1.0.0.bb delete mode 100644 packages/xlibs/libxmu_1.0.1.bb delete mode 100644 packages/xlibs/libxmu_cvs.bb delete mode 100644 packages/xlibs/libxp_1.0.0.bb delete mode 100644 packages/xlibs/libxp_cvs.bb delete mode 100644 packages/xlibs/libxpm/.mtn2git_empty delete mode 100644 packages/xlibs/libxpm/autofoo.patch delete mode 100644 packages/xlibs/libxpm_3.5.1.bb delete mode 100644 packages/xlibs/libxpm_3.5.4.2.bb delete mode 100644 packages/xlibs/libxpm_3.5.5.bb delete mode 100644 packages/xlibs/libxpm_cvs.bb delete mode 100644 packages/xlibs/libxrandr-1.0.2/.mtn2git_empty delete mode 100644 packages/xlibs/libxrandr-1.0.2/autofoo.patch delete mode 100644 packages/xlibs/libxrandr/.mtn2git_empty delete mode 100644 packages/xlibs/libxrandr/autofoo.patch delete mode 100644 packages/xlibs/libxrandr_1.0.2.bb delete mode 100644 packages/xlibs/libxrandr_1.1.0.2.bb delete mode 100644 packages/xlibs/libxrandr_1.1.1.bb delete mode 100644 packages/xlibs/libxrandr_cvs.bb delete mode 100644 packages/xlibs/libxrender/.mtn2git_empty delete mode 100644 packages/xlibs/libxrender/autofoo.patch delete mode 100644 packages/xlibs/libxrender_0.8.4.bb delete mode 100644 packages/xlibs/libxrender_0.9.0.2.bb delete mode 100644 packages/xlibs/libxrender_0.9.1.bb delete mode 100644 packages/xlibs/libxrender_cvs.bb delete mode 100644 packages/xlibs/libxres_1.0.1.bb delete mode 100644 packages/xlibs/libxres_X11R7.0-1.0.0.bb delete mode 100644 packages/xlibs/libxres_X11R7.1-1.0.1.bb delete mode 100644 packages/xlibs/libxres_cvs.bb delete mode 100644 packages/xlibs/libxss_1.0.1.bb delete mode 100644 packages/xlibs/libxss_cvs.bb delete mode 100644 packages/xlibs/libxt/.mtn2git_empty delete mode 100644 packages/xlibs/libxt/autofoo.patch delete mode 100644 packages/xlibs/libxt_0.1.5.bb delete mode 100644 packages/xlibs/libxt_1.0.0.bb delete mode 100644 packages/xlibs/libxt_1.0.2.bb delete mode 100644 packages/xlibs/libxt_cvs.bb delete mode 100644 packages/xlibs/libxtst_1.0.1.bb delete mode 100644 packages/xlibs/libxtst_cvs.bb delete mode 100644 packages/xlibs/libxv_2.2.2+cvs20040918.bb delete mode 100644 packages/xlibs/libxv_2.2.2.bb delete mode 100644 packages/xlibs/libxv_X11R7.0-1.0.1.bb delete mode 100644 packages/xlibs/libxvmc/.mtn2git_empty delete mode 100644 packages/xlibs/libxvmc/drm.patch delete mode 100644 packages/xlibs/libxvmc/true.patch delete mode 100644 packages/xlibs/libxvmc/via.patch delete mode 100644 packages/xlibs/libxvmc_20040919.bb delete mode 100644 packages/xlibs/libxvmc_20041025.bb delete mode 100644 packages/xlibs/libxvmc_20050612.bb delete mode 100644 packages/xlibs/libxxf86dga_1.0.0.bb delete mode 100644 packages/xlibs/libxxf86dga_1.0.1.bb delete mode 100644 packages/xlibs/libxxf86dga_cvs.bb delete mode 100644 packages/xlibs/libxxf86misc_1.0.0.bb delete mode 100644 packages/xlibs/libxxf86misc_1.0.1.bb delete mode 100644 packages/xlibs/libxxf86vm_1.0.0.bb delete mode 100644 packages/xlibs/libxxf86vm_1.0.1.bb delete mode 100644 packages/xlibs/libxxf86vm_cvs.bb delete mode 100644 packages/xlibs/util-macros_1.0.1.bb delete mode 100644 packages/xlibs/util-macros_1.0.2.bb delete mode 100644 packages/xlibs/xorg-xlibs.inc delete mode 100644 packages/xlibs/xtrans-native_0.1.bb delete mode 100644 packages/xlibs/xtrans_0.1.bb delete mode 100644 packages/xlibs/xtrans_1.0.0.bb delete mode 100644 packages/xlibs/xtrans_cvs.bb delete mode 100644 packages/xmodmap/xmodmap/.mtn2git_empty delete mode 100644 packages/xmodmap/xmodmap/autofoo.patch delete mode 100644 packages/xmodmap/xmodmap_1.0.0.bb delete mode 100644 packages/xmodmap/xmodmap_cvs.bb create mode 100644 packages/xorg-app/.mtn2git_empty create mode 100644 packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-app/iceauth_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/rgb_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-app/twm_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xauth/.mtn2git_empty create mode 100644 packages/xorg-app/xauth/autofoo.patch create mode 100644 packages/xorg-app/xauth_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xauth_cvs.bb create mode 100644 packages/xorg-app/xclock_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xdpyinfo/.mtn2git_empty create mode 100644 packages/xorg-app/xdpyinfo/disable-xkb.patch create mode 100644 packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xdpyinfo_cvs.bb create mode 100644 packages/xorg-app/xev/.mtn2git_empty create mode 100644 packages/xorg-app/xev/diet-x11.patch create mode 100644 packages/xorg-app/xev_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xev_cvs.bb create mode 100644 packages/xorg-app/xeyes_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xhost/.mtn2git_empty create mode 100644 packages/xorg-app/xhost/autofoo.patch create mode 100644 packages/xorg-app/xhost_20040413.bb create mode 100644 packages/xorg-app/xhost_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-app/xinit_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xmodmap/.mtn2git_empty create mode 100644 packages/xorg-app/xmodmap/autofoo.patch create mode 100644 packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-app/xmodmap_cvs.bb create mode 100644 packages/xorg-app/xorg-app-common.inc create mode 100644 packages/xorg-app/xprop/.mtn2git_empty create mode 100644 packages/xorg-app/xprop/autofoo.patch create mode 100644 packages/xorg-app/xprop_cvs.bb create mode 100644 packages/xorg-app/xrandr_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xrandr_cvs.bb create mode 100644 packages/xorg-app/xrdb/.mtn2git_empty create mode 100644 packages/xorg-app/xrdb/autofoo.patch create mode 100644 packages/xorg-app/xrdb_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-app/xrdb_cvs.bb create mode 100644 packages/xorg-app/xset/.mtn2git_empty create mode 100644 packages/xorg-app/xset/autofoo.patch create mode 100644 packages/xorg-app/xset/disable-xkb.patch create mode 100644 packages/xorg-app/xset_20040817.bb create mode 100644 packages/xorg-app/xset_X11R7.0-1.0.1.bb delete mode 100644 packages/xorg-data/data-common.inc delete mode 100644 packages/xorg-data/xbitmaps_1.0.1.bb create mode 100644 packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb delete mode 100644 packages/xorg-data/xkbdata_1.0.1.bb create mode 100644 packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-data/xorg-data-common.inc create mode 100644 packages/xorg-font/.mtn2git_empty create mode 100644 packages/xorg-font/files/.mtn2git_empty create mode 100644 packages/xorg-font/files/imake-staging.patch create mode 100644 packages/xorg-font/files/lexer.patch create mode 100644 packages/xorg-font/font-alias_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-font/font-util_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-font/xfonts-xorg_6.8.bb create mode 100644 packages/xorg-font/xorg-font-common.inc delete mode 100644 packages/xorg-fonts/font-alias_1.0.1.bb delete mode 100644 packages/xorg-fonts/font-common.inc delete mode 100644 packages/xorg-fonts/font-cursor-misc_1.0.0.bb delete mode 100644 packages/xorg-fonts/font-misc-misc_1.0.0.bb delete mode 100644 packages/xorg-fonts/font-util_1.0.0.bb create mode 100644 packages/xorg-lib/.mtn2git_empty create mode 100644 packages/xorg-lib/diet-x11/.mtn2git_empty create mode 100644 packages/xorg-lib/diet-x11/X18NCMSstubs.diff create mode 100644 packages/xorg-lib/diet-x11/fix-disable-xlocale.diff create mode 100644 packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch create mode 100644 packages/xorg-lib/diet-x11_20050226.bb create mode 100644 packages/xorg-lib/diet-x11_6.2.1.bb create mode 100644 packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/diet-x11_cvs.bb create mode 100644 packages/xorg-lib/files/.mtn2git_empty create mode 100644 packages/xorg-lib/files/errordb-keysymdb-path-fix.patch create mode 100644 packages/xorg-lib/files/fix-utf8-wrong-define.patch create mode 100644 packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb create mode 100644 packages/xorg-lib/libice/.mtn2git_empty create mode 100644 packages/xorg-lib/libice/autofoo.patch create mode 100644 packages/xorg-lib/libice_6.3.3.bb create mode 100644 packages/xorg-lib/libice_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libice_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libice_cvs.bb create mode 100644 packages/xorg-lib/liblbxutil/.mtn2git_empty create mode 100644 packages/xorg-lib/liblbxutil/mkg3states.patch create mode 100644 packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libsm/.mtn2git_empty create mode 100644 packages/xorg-lib/libsm/autofoo.patch create mode 100644 packages/xorg-lib/libsm_6.0.3.bb create mode 100644 packages/xorg-lib/libsm_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libsm_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libsm_cvs.bb create mode 100644 packages/xorg-lib/libx11-native_6.2.1.bb create mode 100644 packages/xorg-lib/libx11-native_cvs.bb create mode 100644 packages/xorg-lib/libx11/.mtn2git_empty create mode 100644 packages/xorg-lib/libx11/autofoo.patch create mode 100644 packages/xorg-lib/libx11/xim.patch create mode 100644 packages/xorg-lib/libx11_20050226.bb create mode 100644 packages/xorg-lib/libx11_6.2.1.bb create mode 100644 packages/xorg-lib/libx11_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libx11_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libx11_cvs.bb create mode 100644 packages/xorg-lib/libx11_git.bb create mode 100644 packages/xorg-lib/libxau-native_0.1.1.bb create mode 100644 packages/xorg-lib/libxau-native_cvs.bb create mode 100644 packages/xorg-lib/libxau/.mtn2git_empty create mode 100644 packages/xorg-lib/libxau/autofoo.patch create mode 100644 packages/xorg-lib/libxau_0.1.1.bb create mode 100644 packages/xorg-lib/libxau_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxau_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxau_cvs.bb create mode 100644 packages/xorg-lib/libxaw/.mtn2git_empty create mode 100644 packages/xorg-lib/libxaw/auxdir.patch create mode 100644 packages/xorg-lib/libxaw_7.0.2.bb create mode 100644 packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb create mode 100644 packages/xorg-lib/libxaw_cvs.bb create mode 100644 packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty create mode 100644 packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch create mode 100644 packages/xorg-lib/libxcomposite/.mtn2git_empty create mode 100644 packages/xorg-lib/libxcomposite/change-include-order.patch create mode 100644 packages/xorg-lib/libxcomposite_1.0.1.bb create mode 100644 packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb create mode 100644 packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb create mode 100644 packages/xorg-lib/libxcomposite_cvs.bb create mode 100644 packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty create mode 100644 packages/xorg-lib/libxcursor-1.1.2/autofoo.patch create mode 100644 packages/xorg-lib/libxcursor/.mtn2git_empty create mode 100644 packages/xorg-lib/libxcursor/autofoo.patch create mode 100644 packages/xorg-lib/libxcursor_1.1.2.bb create mode 100644 packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb create mode 100644 packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb create mode 100644 packages/xorg-lib/libxcursor_cvs.bb create mode 100644 packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty create mode 100644 packages/xorg-lib/libxdamage-1.0.1/autofoo.patch create mode 100644 packages/xorg-lib/libxdamage/.mtn2git_empty create mode 100644 packages/xorg-lib/libxdamage/m4.patch create mode 100644 packages/xorg-lib/libxdamage_1.0.1.bb create mode 100644 packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb create mode 100644 packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb create mode 100644 packages/xorg-lib/libxdamage_cvs.bb create mode 100644 packages/xorg-lib/libxdmcp-native_0.1.1.bb create mode 100644 packages/xorg-lib/libxdmcp-native_0.1.3.bb create mode 100644 packages/xorg-lib/libxdmcp/.mtn2git_empty create mode 100644 packages/xorg-lib/libxdmcp/autofoo.patch create mode 100644 packages/xorg-lib/libxdmcp_0.1.1.bb create mode 100644 packages/xorg-lib/libxdmcp_0.1.3.bb create mode 100644 packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxdmcp_cvs.bb create mode 100644 packages/xorg-lib/libxext-native_cvs.bb create mode 100644 packages/xorg-lib/libxext/.mtn2git_empty create mode 100644 packages/xorg-lib/libxext/autofoo.patch create mode 100644 packages/xorg-lib/libxext_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxext_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxext_cvs.bb create mode 100644 packages/xorg-lib/libxfixes/.mtn2git_empty create mode 100644 packages/xorg-lib/libxfixes/autofoo.patch create mode 100644 packages/xorg-lib/libxfixes_2.0.1.bb create mode 100644 packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb create mode 100644 packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb create mode 100644 packages/xorg-lib/libxfixes_cvs.bb create mode 100644 packages/xorg-lib/libxfont/.mtn2git_empty create mode 100644 packages/xorg-lib/libxfont/autofoo.patch create mode 100644 packages/xorg-lib/libxfont/scalable.patch create mode 100644 packages/xorg-lib/libxfont_1.4.2.bb create mode 100644 packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb create mode 100644 packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb create mode 100644 packages/xorg-lib/libxfont_cvs.bb create mode 100644 packages/xorg-lib/libxft/.mtn2git_empty create mode 100644 packages/xorg-lib/libxft/autofoo.patch create mode 100644 packages/xorg-lib/libxft_2.1.6.bb create mode 100644 packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb create mode 100644 packages/xorg-lib/libxft_cvs.bb create mode 100644 packages/xorg-lib/libxi/.mtn2git_empty create mode 100644 packages/xorg-lib/libxi/autofoo.patch create mode 100644 packages/xorg-lib/libxi_6.0.1.bb create mode 100644 packages/xorg-lib/libxi_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxi_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxi_cvs.bb create mode 100644 packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb create mode 100644 packages/xorg-lib/libxinerama_1.0.2.bb create mode 100644 packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxinerama_cvs.bb create mode 100644 packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb create mode 100644 packages/xorg-lib/libxkbfile_cvs.bb create mode 100644 packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb create mode 100644 packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxmu_cvs.bb create mode 100644 packages/xorg-lib/libxp_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxp_cvs.bb create mode 100644 packages/xorg-lib/libxpm/.mtn2git_empty create mode 100644 packages/xorg-lib/libxpm/autofoo.patch create mode 100644 packages/xorg-lib/libxpm_3.5.1.bb create mode 100644 packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb create mode 100644 packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb create mode 100644 packages/xorg-lib/libxpm_cvs.bb create mode 100644 packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty create mode 100644 packages/xorg-lib/libxrandr-1.0.2/autofoo.patch create mode 100644 packages/xorg-lib/libxrandr/.mtn2git_empty create mode 100644 packages/xorg-lib/libxrandr/autofoo.patch create mode 100644 packages/xorg-lib/libxrandr_1.0.2.bb create mode 100644 packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb create mode 100644 packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb create mode 100644 packages/xorg-lib/libxrandr_cvs.bb create mode 100644 packages/xorg-lib/libxrender/.mtn2git_empty create mode 100644 packages/xorg-lib/libxrender/autofoo.patch create mode 100644 packages/xorg-lib/libxrender_0.8.4.bb create mode 100644 packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb create mode 100644 packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb create mode 100644 packages/xorg-lib/libxrender_cvs.bb create mode 100644 packages/xorg-lib/libxres_1.0.1.bb create mode 100644 packages/xorg-lib/libxres_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxres_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxres_cvs.bb create mode 100644 packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxss_cvs.bb create mode 100644 packages/xorg-lib/libxt/.mtn2git_empty create mode 100644 packages/xorg-lib/libxt/autofoo.patch create mode 100644 packages/xorg-lib/libxt_0.1.5.bb create mode 100644 packages/xorg-lib/libxt_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxt_X11R7.1-1.0.2.bb create mode 100644 packages/xorg-lib/libxt_cvs.bb create mode 100644 packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxtst_cvs.bb create mode 100644 packages/xorg-lib/libxv_2.2.2+cvs20040918.bb create mode 100644 packages/xorg-lib/libxv_2.2.2.bb create mode 100644 packages/xorg-lib/libxv_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-lib/libxvmc/.mtn2git_empty create mode 100644 packages/xorg-lib/libxvmc/drm.patch create mode 100644 packages/xorg-lib/libxvmc/true.patch create mode 100644 packages/xorg-lib/libxvmc/via.patch create mode 100644 packages/xorg-lib/libxvmc_20040919.bb create mode 100644 packages/xorg-lib/libxvmc_20041025.bb create mode 100644 packages/xorg-lib/libxvmc_20050612.bb create mode 100644 packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxxf86dga_cvs.bb create mode 100644 packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb create mode 100644 packages/xorg-lib/libxxf86vm_cvs.bb create mode 100644 packages/xorg-lib/xorg-lib-common.inc create mode 100644 packages/xorg-lib/xtrans-native_0.1.bb create mode 100644 packages/xorg-lib/xtrans_0.1.bb create mode 100644 packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb create mode 100644 packages/xorg-lib/xtrans_cvs.bb create mode 100644 packages/xorg-proto/.mtn2git_empty create mode 100644 packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb create mode 100644 packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb create mode 100644 packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb create mode 100644 packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb create mode 100644 packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb create mode 100644 packages/xorg-proto/evieext_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb create mode 100644 packages/xorg-proto/fixesproto_X11R7.1-4.0.bb create mode 100644 packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb create mode 100644 packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb create mode 100644 packages/xorg-proto/glproto_X11R7.0-1.4.3.bb create mode 100644 packages/xorg-proto/glproto_X11R7.1-1.4.7.bb create mode 100644 packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb create mode 100644 packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-proto/printproto_X11R7.0-1.0.3.bb create mode 100644 packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb create mode 100644 packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb create mode 100644 packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb create mode 100644 packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb create mode 100644 packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb create mode 100644 packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb create mode 100644 packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb create mode 100644 packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb create mode 100644 packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb create mode 100644 packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb create mode 100644 packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb create mode 100644 packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb create mode 100644 packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb create mode 100644 packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb create mode 100644 packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb create mode 100644 packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb create mode 100644 packages/xorg-proto/xorg-proto-common.inc create mode 100644 packages/xorg-proto/xproto-native_6.6.2.bb create mode 100644 packages/xorg-proto/xproto-native_cvs.bb create mode 100644 packages/xorg-proto/xproto_6.6.2+cvs20050226.bb create mode 100644 packages/xorg-proto/xproto_6.6.2.bb create mode 100644 packages/xorg-proto/xproto_X11R7.0-7.0.4.bb create mode 100644 packages/xorg-proto/xproto_X11R7.1-7.0.5.bb create mode 100644 packages/xorg-proto/xproto_cvs.bb create mode 100644 packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb create mode 100644 packages/xorg-util/.mtn2git_empty create mode 100644 packages/xorg-util/util-macros_X11R7.0-1.0.1.bb create mode 100644 packages/xorg-util/util-macros_X11R7.1-1.0.2.bb create mode 100644 packages/xorg-xserver/.mtn2git_empty create mode 100644 packages/xorg-xserver/files/.mtn2git_empty create mode 100644 packages/xorg-xserver/files/calibrate_zaurusd.patch create mode 100644 packages/xorg-xserver/files/poodle-xmodmap-2.6.patch create mode 100644 packages/xorg-xserver/files/setDPI.sh create mode 100644 packages/xorg-xserver/xserver-common_1.10.bb create mode 100644 packages/xorg-xserver/xserver-common_1.3.bb create mode 100644 packages/xorg-xserver/xserver-common_1.8.bb create mode 100644 packages/xorg-xserver/xserver-common_1.9.bb create mode 100644 packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-omap/kmode.patch create mode 100644 packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb create mode 100644 packages/xorg-xserver/xserver-kdrive/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff create mode 100644 packages/xorg-xserver/xserver-kdrive/devfs.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/disable-apm.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/enable-tslib.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/epson.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/faster-rotated.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/kmode.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/onlyfb.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/optional-xkb.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/xcalibrate.patch create mode 100644 packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch create mode 100644 packages/xorg-xserver/xserver-kdrive_20050207.bb create mode 100644 packages/xorg-xserver/xserver-kdrive_20050624.bb create mode 100644 packages/xorg-xserver/xserver-kdrive_20060312.bb create mode 100644 packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb create mode 100644 packages/xorg-xserver/xserver-kdrive_cvs.bb create mode 100644 packages/xorg-xserver/xserver-kdrive_git.bb create mode 100644 packages/xorg-xserver/xserver-xorg/.mtn2git_empty create mode 100644 packages/xorg-xserver/xserver-xorg/dri.patch create mode 100644 packages/xorg-xserver/xserver-xorg/fontfile.patch create mode 100644 packages/xorg-xserver/xserver-xorg/freetype.patch create mode 100644 packages/xorg-xserver/xserver-xorg/imake-installed.patch create mode 100644 packages/xorg-xserver/xserver-xorg/imake-staging.patch create mode 100644 packages/xorg-xserver/xserver-xorg_6.8.99.10.bb create mode 100644 packages/xorg-xserver/xserver-xorg_6.8.99.11.bb create mode 100644 packages/xorg-xserver/xserver-xorg_cvs.bb delete mode 100644 packages/xprop/xprop/.mtn2git_empty delete mode 100644 packages/xprop/xprop/autofoo.patch delete mode 100644 packages/xprop/xprop_cvs.bb delete mode 100644 packages/xproto/applewmproto_1.0.3.bb delete mode 100644 packages/xproto/bigreqsproto_1.0.2.bb delete mode 100644 packages/xproto/compositeproto_0.2.2.bb delete mode 100644 packages/xproto/compositeproto_0.3.1.bb delete mode 100644 packages/xproto/damageproto_1.0.3.bb delete mode 100644 packages/xproto/dmxproto_2.2.2.bb delete mode 100644 packages/xproto/evieext_1.0.2.bb delete mode 100644 packages/xproto/fixesproto_3.0.2.bb delete mode 100644 packages/xproto/fixesproto_4.0.bb delete mode 100644 packages/xproto/fontcacheproto_0.1.2.bb delete mode 100644 packages/xproto/fontsproto_2.0.2.bb delete mode 100644 packages/xproto/glproto_1.4.3.bb delete mode 100644 packages/xproto/glproto_1.4.7.bb delete mode 100644 packages/xproto/inputproto_1.3.2.bb delete mode 100644 packages/xproto/kbproto_1.0.2.bb delete mode 100644 packages/xproto/printproto_1.0.3.bb delete mode 100644 packages/xproto/proto-common.inc delete mode 100644 packages/xproto/randrproto_1.1.2.bb delete mode 100644 packages/xproto/recordproto_1.13.2.bb delete mode 100644 packages/xproto/renderproto_0.9.2.bb delete mode 100644 packages/xproto/resourceproto_1.0.2.bb delete mode 100644 packages/xproto/scrnsaverproto_1.0.2.bb delete mode 100644 packages/xproto/scrnsaverproto_1.1.0.bb delete mode 100644 packages/xproto/trapproto_3.4.3.bb delete mode 100644 packages/xproto/videoproto_2.2.2.bb delete mode 100644 packages/xproto/windowswmproto_1.0.3.bb delete mode 100644 packages/xproto/xcmiscproto_1.1.2.bb delete mode 100644 packages/xproto/xextproto_7.0.2.bb delete mode 100644 packages/xproto/xf86bigfontproto_1.1.2.bb delete mode 100644 packages/xproto/xf86dgaproto_2.0.2.bb delete mode 100644 packages/xproto/xf86driproto_2.0.3.bb delete mode 100644 packages/xproto/xf86miscproto_0.9.2.bb delete mode 100644 packages/xproto/xf86rushproto_1.1.2.bb delete mode 100644 packages/xproto/xf86vidmodeproto_2.2.2.bb delete mode 100644 packages/xproto/xineramaproto_1.1.2.bb delete mode 100644 packages/xproto/xproto-native_6.6.2.bb delete mode 100644 packages/xproto/xproto-native_cvs.bb delete mode 100644 packages/xproto/xproto_6.6.2+cvs20050226.bb delete mode 100644 packages/xproto/xproto_6.6.2.bb delete mode 100644 packages/xproto/xproto_7.0.4.bb delete mode 100644 packages/xproto/xproto_7.0.5.bb delete mode 100644 packages/xproto/xproto_cvs.bb delete mode 100644 packages/xproto/xproxymanagementprotocol_1.0.2.bb delete mode 100644 packages/xrandr/xrandr_1.0.1.bb delete mode 100644 packages/xrandr/xrandr_cvs.bb delete mode 100644 packages/xrdb/xrdb/.mtn2git_empty delete mode 100644 packages/xrdb/xrdb/autofoo.patch delete mode 100644 packages/xrdb/xrdb_1.0.1.bb delete mode 100644 packages/xrdb/xrdb_cvs.bb delete mode 100644 packages/xserver-common/files/.mtn2git_empty delete mode 100644 packages/xserver-common/files/calibrate_zaurusd.patch delete mode 100644 packages/xserver-common/files/poodle-xmodmap-2.6.patch delete mode 100644 packages/xserver-common/files/setDPI.sh delete mode 100644 packages/xserver-common/xserver-common_1.10.bb delete mode 100644 packages/xserver-common/xserver-common_1.3.bb delete mode 100644 packages/xserver-common/xserver-common_1.8.bb delete mode 100644 packages/xserver-common/xserver-common_1.9.bb delete mode 100644 packages/xserver/.mtn2git_empty delete mode 100644 packages/xserver/xserver-kdrive-omap/.mtn2git_empty delete mode 100644 packages/xserver/xserver-kdrive-omap/configure-tslib.patch delete mode 100644 packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch delete mode 100644 packages/xserver/xserver-kdrive-omap/kmode.patch delete mode 100644 packages/xserver/xserver-kdrive-omap_6.6.3.bb delete mode 100644 packages/xserver/xserver-kdrive/.mtn2git_empty delete mode 100644 packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff delete mode 100644 packages/xserver/xserver-kdrive/devfs.patch delete mode 100644 packages/xserver/xserver-kdrive/disable-apm.patch delete mode 100644 packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch delete mode 100644 packages/xserver/xserver-kdrive/enable-builtin-fonts.patch delete mode 100644 packages/xserver/xserver-kdrive/enable-tslib.patch delete mode 100644 packages/xserver/xserver-kdrive/epson.patch delete mode 100644 packages/xserver/xserver-kdrive/faster-rotated.patch delete mode 100644 packages/xserver/xserver-kdrive/fbdev-not-fix.patch delete mode 100644 packages/xserver/xserver-kdrive/kdrive-evdev.patch delete mode 100644 packages/xserver/xserver-kdrive/kdrive-use-evdev.patch delete mode 100644 packages/xserver/xserver-kdrive/kmode.patch delete mode 100644 packages/xserver/xserver-kdrive/no-serial-probing.patch delete mode 100644 packages/xserver/xserver-kdrive/onlyfb.patch delete mode 100644 packages/xserver/xserver-kdrive/optional-xkb.patch delete mode 100644 packages/xserver/xserver-kdrive/xcalibrate.patch delete mode 100644 packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch delete mode 100644 packages/xserver/xserver-kdrive_20050207.bb delete mode 100644 packages/xserver/xserver-kdrive_20050624.bb delete mode 100644 packages/xserver/xserver-kdrive_20060312.bb delete mode 100644 packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb delete mode 100644 packages/xserver/xserver-kdrive_cvs.bb delete mode 100644 packages/xserver/xserver-kdrive_git.bb delete mode 100644 packages/xserver/xserver-xorg/.mtn2git_empty delete mode 100644 packages/xserver/xserver-xorg/dri.patch delete mode 100644 packages/xserver/xserver-xorg/fontfile.patch delete mode 100644 packages/xserver/xserver-xorg/freetype.patch delete mode 100644 packages/xserver/xserver-xorg/imake-installed.patch delete mode 100644 packages/xserver/xserver-xorg/imake-staging.patch delete mode 100644 packages/xserver/xserver-xorg_6.8.99.10.bb delete mode 100644 packages/xserver/xserver-xorg_6.8.99.11.bb delete mode 100644 packages/xserver/xserver-xorg_cvs.bb delete mode 100644 packages/xset/xset/.mtn2git_empty delete mode 100644 packages/xset/xset/autofoo.patch delete mode 100644 packages/xset/xset/disable-xkb.patch delete mode 100644 packages/xset/xset_1.0.1.bb delete mode 100644 packages/xset/xset_20040817.bb diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc deleted file mode 100644 index 9d668cd9b2..0000000000 --- a/packages/x11-apps/app-common.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X application" -SECTION = "x11/apps" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2" - -S = ${WORKDIR}/${PN}-X11R7.0-${PV} - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/x11-apps/bdftopcf_1.0.0.bb b/packages/x11-apps/bdftopcf_1.0.0.bb deleted file mode 100644 index 96492be848..0000000000 --- a/packages/x11-apps/bdftopcf_1.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libxfont" diff --git a/packages/x11-apps/iceauth_1.0.1.bb b/packages/x11-apps/iceauth_1.0.1.bb deleted file mode 100644 index 19b59b8381..0000000000 --- a/packages/x11-apps/iceauth_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libice" diff --git a/packages/x11-apps/mkfontdir_1.0.1.bb b/packages/x11-apps/mkfontdir_1.0.1.bb deleted file mode 100644 index eff2e125e7..0000000000 --- a/packages/x11-apps/mkfontdir_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "mkfontscale" diff --git a/packages/x11-apps/mkfontscale_1.0.1.bb b/packages/x11-apps/mkfontscale_1.0.1.bb deleted file mode 100644 index ead4663781..0000000000 --- a/packages/x11-apps/mkfontscale_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libfontenc freetype" diff --git a/packages/x11-apps/rgb_1.0.0.bb b/packages/x11-apps/rgb_1.0.0.bb deleted file mode 100644 index 714ab3f83f..0000000000 --- a/packages/x11-apps/rgb_1.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libxt" diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb deleted file mode 100644 index e02bc4cf7b..0000000000 --- a/packages/x11-apps/twm_1.0.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -PR = "r1" - -include app-common.inc -DEPENDS = "libx11 libxt libxmu" - -inherit update-alternatives - -ALTERNATIVE_PATH = "${bindir}/twm" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "1" - - - diff --git a/packages/x11-apps/xauth/.mtn2git_empty b/packages/x11-apps/xauth/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/x11-apps/xauth/autofoo.patch b/packages/x11-apps/xauth/autofoo.patch deleted file mode 100644 index d279a6f4fc..0000000000 --- a/packages/x11-apps/xauth/autofoo.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff -urN xauth.orig/Imakefile xauth/Imakefile ---- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200 -+++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,19 +0,0 @@ --XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ -- -- -- -- --XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $ -- -- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB) --LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB) -- SRCS = xauth.c gethost.c process.c parsedpy.c -- OBJS = xauth.o gethost.o process.o parsedpy.o -- CONN_DEFINES = $(CONNECTION_FLAGS) -- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES) -- --ComplexProgramTarget(xauth) -- --SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) --SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) --SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES)) -diff -urN xauth.orig/Makefile.am xauth/Makefile.am ---- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XAUTH_CFLAGS@ -+ -+bin_PROGRAMS = xauth -+ -+xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h -+ -+xauth_LDADD = @XAUTH_LIBS@ -+ -+man5_MANS=xauth.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xauth.orig/autogen.sh xauth/autogen.sh ---- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200 -@@ -0,0 +1,3 @@ -+#! /bin/sh -+autoreconf -v --install || exit 1 -+./configure --enable-maintainer-mode "$@" -diff -urN xauth.orig/configure.ac xauth/configure.ac ---- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200 -@@ -0,0 +1,57 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xauth],4.4.0,[],xauth) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11) -+ -+AC_TYPE_SIGNAL -+ -+# Transport selection -+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) -+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) -+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) -+if test "$UNIXCONN" = "yes"; then -+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) -+fi -+if test "$TCPCONN" = "yes"; then -+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) -+fi -+if test "$IPV6CONN" = "yes"; then -+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) -+fi -+ -+AC_OUTPUT([Makefile]) diff --git a/packages/x11-apps/xauth_1.0.1.bb b/packages/x11-apps/xauth_1.0.1.bb deleted file mode 100644 index c9d1a12ba2..0000000000 --- a/packages/x11-apps/xauth_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libxau libxext libxmu" diff --git a/packages/x11-apps/xauth_cvs.bb b/packages/x11-apps/xauth_cvs.bb deleted file mode 100644 index 54700574b7..0000000000 --- a/packages/x11-apps/xauth_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -DEPENDS = "libx11 libxau libxmu libxext" -DESCRIPTION = "X authority file utility" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xauth" - -inherit autotools pkgconfig diff --git a/packages/x11-apps/xclock_1.0.1.bb b/packages/x11-apps/xclock_1.0.1.bb deleted file mode 100644 index 8a4b59d811..0000000000 --- a/packages/x11-apps/xclock_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libxrender libxft libxkbfile libxaw" diff --git a/packages/x11-apps/xeyes_1.0.1.bb b/packages/x11-apps/xeyes_1.0.1.bb deleted file mode 100644 index c9d1a12ba2..0000000000 --- a/packages/x11-apps/xeyes_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libxau libxext libxmu" diff --git a/packages/x11-apps/xinit_1.0.1.bb b/packages/x11-apps/xinit_1.0.1.bb deleted file mode 100644 index 2e65b76202..0000000000 --- a/packages/x11-apps/xinit_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 twm xclock xeyes xrdb" diff --git a/packages/x11-apps/xkbcomp_1.0.1.bb b/packages/x11-apps/xkbcomp_1.0.1.bb deleted file mode 100644 index 808f5d0a6d..0000000000 --- a/packages/x11-apps/xkbcomp_1.0.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -include app-common.inc -DEPENDS = "libx11 libxkbfile" diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch deleted file mode 100644 index 24af21f4fc..0000000000 --- a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 -+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 -@@ -45,11 +45,15 @@ - AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) - -+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), -+ XKB="$enableval", XKB="yes") -+if test "x$XKB" = "xyes" ; then - PKG_CHECK_MODULES(DPY_XKB, x11, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -+fi - - PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, - [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb deleted file mode 100644 index a8972e18ab..0000000000 --- a/packages/xdpyinfo/xdpyinfo_1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "libx11 libxext libxtst" -DESCRIPTION = "X display information utility" -SECTION = "x11/base" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \ - file://disable-xkb.patch;patch=1" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -EXTRA_OECONF = "--disable-xkb" - -inherit autotools pkgconfig diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb deleted file mode 100644 index eb63ae7f4d..0000000000 --- a/packages/xdpyinfo/xdpyinfo_cvs.bb +++ /dev/null @@ -1,12 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -DEPENDS = "libx11 libxext libxtst" -DESCRIPTION = "X display information utility" -MAINTAINER = "Phil Blundell " -SECTION = "x11/base" -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo" -S = "${WORKDIR}/xdpyinfo" - -inherit autotools pkgconfig diff --git a/packages/xev/files/.mtn2git_empty b/packages/xev/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xev/files/diet-x11.patch b/packages/xev/files/diet-x11.patch deleted file mode 100644 index 7e93f160a5..0000000000 --- a/packages/xev/files/diet-x11.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- xev/xev.c 2004-02-06 11:00:37.000000000 -0800 -+++ xev/xev.new.c 2005-08-04 15:40:36.000000000 -0700 -@@ -149,7 +149,7 @@ - nbytes = XLookupString (e, str, 256, &ks, NULL); - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - do { - nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); - buf[nmbbytes] = '\0'; -@@ -159,7 +159,7 @@ - buf = realloc (buf, bsize); - } - } while (status == XBufferOverflow); -- } -+ }*/ - - if (ks == NoSymbol) - ksname = "NoSymbol"; -@@ -189,7 +189,7 @@ - } - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - printf (" XmbLookupString gives %d bytes: ", nmbbytes); - if (nmbbytes > 0) { - dump (buf, nmbbytes); -@@ -200,7 +200,7 @@ - - printf (" XFilterEvent returns: %s\n", - XFilterEvent (eventp, e->window) ? "True" : "False"); -- } -+ }*/ - } - - static void -@@ -857,7 +857,7 @@ - fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); - } - -- xim = XOpenIM (dpy, NULL, NULL, NULL); -+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); - if (xim == NULL) { - fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); - } -@@ -884,7 +884,7 @@ - } - XFree (xim_styles); - } -- } -+ }*/ - - screen = DefaultScreen (dpy); - -@@ -948,7 +948,7 @@ - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); - } - -- if (xim && xim_style) { -+ /*if (xim && xim_style) { - xic = XCreateIC (xim, - XNInputStyle, xim_style, - XNClientWindow, w, -@@ -958,7 +958,7 @@ - if (xic == NULL) { - fprintf (stderr, "XCreateIC failed\n"); - } -- } -+ }*/ - - for (done = 0; !done; ) { - XEvent event; diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb deleted file mode 100644 index 2d0f79b046..0000000000 --- a/packages/xev/xev_1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Event Viewer" -HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" -LICENSE = "MIT" -MAINTAINER = "Justin Patrin " -SECTION = "x11/base" -DEPENDS = "libx11 libxau" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \ - file://diet-x11.patch;patch=1" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb deleted file mode 100644 index 3ea9d05c63..0000000000 --- a/packages/xev/xev_cvs.bb +++ /dev/null @@ -1,21 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -DESCRIPTION = "X Event Viewer" -HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" -LICENSE = "MIT" -MAINTAINER = "Justin Patrin " -SECTION = "x11/base" -DEPENDS = "libx11 libxau" -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \ - file://diet-x11.patch;patch=1" -S = "${WORKDIR}/xev" - -do_compile() { - ${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${PN} ${D}${bindir} -} diff --git a/packages/xfonts/imake-staging.patch b/packages/xfonts/imake-staging.patch deleted file mode 100644 index bf2e350830..0000000000 --- a/packages/xfonts/imake-staging.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 -@@ -2038,11 +2038,11 @@ - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib $(INSTALLED_LIBS) - LDPOSTLIB = LdPostLib -- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) - CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) ---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 -+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 -@@ -114,7 +114,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif ---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 -@@ -3359,7 +3359,7 @@ - FREETYPE2LIBDIR = Freetype2LibDir - FREETYPE2INCDIR = Freetype2IncDir - #if Freetype2LibDirStandard --FREETYPE2LIB = -lfreetype -+FREETYPE2LIB = $(LD_STAGING) -lfreetype - #else - FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype - #endif diff --git a/packages/xfonts/lexer.patch b/packages/xfonts/lexer.patch deleted file mode 100644 index c3caf57174..0000000000 --- a/packages/xfonts/lexer.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l ---- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000 -+++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000 -@@ -41,6 +41,7 @@ - #include - #include - #include -+int yy_prev_more_offset; - - #include "pswpriv.h" - #include "pswparser.h" -diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l ---- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000 -+++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000 -@@ -65,6 +41,7 @@ - #include "gram.h" - #include "list.h" - #include "parse.h" -+int yy_prev_more_offset; - - #ifdef FLEX_SCANNER - int yylineno; -diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l ---- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000 -+++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000 -@@ -11,6 +11,9 @@ - #include - #include "gram.h" - #include "constants.h" -+ -+int yy_prev_more_offset; -+ - #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) - int yylineno = 0; - #endif -diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l ---- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000 -+++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000 -@@ -37,6 +37,9 @@ - #include "parser.h" - #include - #include -+ -+int yy_prev_more_offset; -+ - static int getdimension(int token, const char *text, int leng); - static int getstring(int token, const char *text, int leng); - static int gettoken(int token, const char *text, int leng); diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb deleted file mode 100644 index f6710dcd5b..0000000000 --- a/packages/xfonts/xfonts-xorg_6.8.bb +++ /dev/null @@ -1,57 +0,0 @@ -SECTION = "x11/base" -PR = "r1" -# XXX Is this true? These fonts are from X.org. -LICENSE = "XFree86" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \ - file://lexer.patch;patch=1" - - -PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}" -FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi" -FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi" -FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1" -FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF" -FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic" -FILES_${PN} = "${libdir}/X11/fonts" - -PACKAGE_ARCH = "all" - -S = "${WORKDIR}/xc" - -do_configure() { - echo "#define ProjectRoot /usr" >> config/cf/host.def - echo "#define XnestServer NO" >> config/cf/host.def - echo "#define XdmxServer NO" >> config/cf/host.def - echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def - echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def - echo "#define BuildFreetype2Library YES" >> config/cf/host.def - echo "#define HasFreetype2 NO" >> config/cf/host.def - echo "" > config/cf/date.def - make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake - make CC="${BUILD_CC}" xmakefile - make Makefiles - make clean -} - -do_compile() { - #make depend - make includes - make -C config/util - make -C lib/freetype2 - make -C lib/font - make -C lib/fontenc - make -C lib/fontconfig - make -C programs/mkfontscale - make -C programs/bdftopcf - make -C programs/fc-cache - make -C fonts -} - -do_install() { - make -C fonts DESTDIR="${D}" install -} - -do_stage() { - : -} diff --git a/packages/xhost/xhost/.mtn2git_empty b/packages/xhost/xhost/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xhost/xhost/autofoo.patch b/packages/xhost/xhost/autofoo.patch deleted file mode 100644 index b29f017abc..0000000000 --- a/packages/xhost/xhost/autofoo.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -urN xhost.orig/Imakefile xhost/Imakefile ---- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100 -+++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,16 +0,0 @@ --XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ --#if HasSecureRPC --RPC_DEFINES = -DSECURE_RPC --#else --RPC_DEFINES = --#endif --KRB5_DEFINES = Krb5Defines --KRB5_INCLUDE = Krb5Includes -- INCLUDES = $(KRB5_INCLUDE) -- DEPLIBS = $(DEPXMULIB) $(DEPXLIB) --LOCAL_LIBRARIES = $(XMULIB) $(XLIB) -- SRCS = xhost.c -- OBJS = xhost.o -- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) -- --ComplexProgramTarget(xhost) -diff -urN xhost.orig/Makefile.am xhost/Makefile.am ---- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XHOST_CFLAGS@ -+ -+bin_PROGRAMS = xhost -+ -+xhost_SOURCES = xhost.c -+ -+xhost_LDADD = @XHOST_LIBS@ -+ -+man5_MANS=xhost.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xhost.orig/configure.ac xhost/configure.ac ---- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200 -@@ -0,0 +1,57 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xhost],4.4.0,[],xhost) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XHOST, xext xmuu x11) -+ -+AC_TYPE_SIGNAL -+ -+# Transport selection -+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) -+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) -+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) -+if test "$UNIXCONN" = "yes"; then -+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) -+fi -+if test "$TCPCONN" = "yes"; then -+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) -+fi -+if test "$IPV6CONN" = "yes"; then -+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) -+fi -+ -+AC_OUTPUT([Makefile]) -diff -urN xhost.orig/xhost.c xhost/xhost.c ---- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100 -+++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200 -@@ -27,6 +27,10 @@ - - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #if defined(TCPCONN) || defined(STREAMSCONN) - #define NEEDSOCKETS - #endif -@@ -102,11 +106,7 @@ - static int local_xerror(); - static char *get_hostname(); - --#ifdef SIGNALRETURNSINT --#define signal_t int --#else --#define signal_t void --#endif -+#define signal_t RETSIGTYPE - static signal_t nameserver_lost(); - - #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */ diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb deleted file mode 100644 index 220de1b535..0000000000 --- a/packages/xhost/xhost_1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "libx11 libxext libxmu" -DESCRIPTION = "server access control program for X" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools pkgconfig diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb deleted file mode 100644 index 4d36e62bee..0000000000 --- a/packages/xhost/xhost_20040413.bb +++ /dev/null @@ -1,14 +0,0 @@ -FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -LICENSE = "MIT" -PV = "0.0+cvs${FIXEDSRCDATE}" -DEPENDS = "libx11 libxext libxmu" -DESCRIPTION = "server access control program for X" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xhost" - -inherit autotools pkgconfig diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xlibs/diet-x11/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xlibs/diet-x11/X18NCMSstubs.diff deleted file mode 100644 index 54b1727a95..0000000000 --- a/packages/xlibs/diet-x11/X18NCMSstubs.diff +++ /dev/null @@ -1,528 +0,0 @@ ---- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 -@@ -83,6 +83,7 @@ - * from UCS char to specified charset char. - * This converter is needed for _XimGetCharCode subroutine. - */ -+#ifdef XLOCALE - XPointer - _XimGetLocaleCode ( - _Xconst char* encoding_name) -@@ -96,6 +97,7 @@ - } - return cvt; - } -+#endif - - /* - * Returns the locale dependent representation of a keysym. -@@ -107,6 +109,7 @@ - * locale - */ - /*ARGSUSED*/ -+#ifdef XLOCALE - int - _XimGetCharCode ( - XPointer ucs_conv, -@@ -135,6 +138,7 @@ - buf[count]= '\0'; - return count; - } -+#endif - - #ifdef XKB - static int lookup_string( ---- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100 -@@ -0,0 +1,428 @@ -+/* -+ * X18NCMSstubs.c -+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed -+ * -+ * Copyright © 2003 Matthew Allum -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Matthew Allum not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Keith Packard and Compaq makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, -+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include -+#include "Xlibint.h" -+#include "Xlcint.h" -+#include -+#include -+#ifdef WIN32 -+#undef close -+#endif -+#include -+#include "XlcPubI.h" -+ -+#include "Xcmsint.h" /* for XcmsCCC type */ -+#include "XlcPubI.h" /* for XLCd type */ -+#include "config.h" -+ -+#if ! XLOCALE -+ -+Bool -+XSupportsLocale() -+{ -+ return False; -+} -+ -+char * -+XSetLocaleModifiers( -+ const char *modifiers) -+{ -+ return NULL; -+} -+ -+XLCd -+_XOpenLC( -+ char *name) -+{ -+ return NULL; -+} -+ -+XLCd -+_XlcCurrentLC() -+{ -+ return NULL; -+} -+ -+void -+_XlcVaToArgList( -+ va_list var, -+ int count, -+ XlcArgList *args_ret) -+{ -+ return; -+} -+ -+void -+_XlcCountVaList( -+ va_list var, -+ int *count_ret) -+{ -+ return; -+} -+ -+void -+_XCloseLC( -+ XLCd lcd) -+{ -+ return; -+} -+ -+int -+_XlcConvert( -+ XlcConv conv, -+ XPointer *from, -+ int *from_left, -+ XPointer *to, -+ int *to_left, -+ XPointer *args, -+ int num_args) -+{ -+ return 0; -+} -+ -+/* XIM Stubs */ -+ -+XPointer -+_XimGetLocaleCode ( _Xconst char* encoding_name ) -+{ -+ return NULL; -+} -+ -+int -+_XimGetCharCode ( -+ XPointer ucs_conv, -+ KeySym keysym, -+ unsigned char* buf, -+ int nbytes) -+{ -+ return 0; -+} -+ -+/* Xrm Stubs */ -+ -+XrmMethods -+_XrmInitParseInfo( -+ XPointer *state) -+{ -+ return (XrmMethods) NULL; -+} -+ -+/* Xwc Stubs */ -+ -+int -+XwcTextExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XwcDrawString(Display *display, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, int y, -+ _Xconst wchar_t *string, -+ int num_wchars) -+{ -+ ; -+} -+ -+void -+XwcDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XwcTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XwcDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XwcTextEscapement( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XwcTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ ; -+} -+ -+int -+XwcTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ wchar_t ***list_ret, -+ int *count_ret) -+{ -+ return 0; -+} -+ -+int -+XwcTextListToTextProperty( -+ Display *dpy, -+ wchar_t **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return 0; -+} -+ -+void -+XwcFreeStringList(wchar_t **list) -+{ -+ return; -+} -+ -+ -+void XmbSetWMProperties ( /* Actually from mbWMProps.c */ -+ Display *dpy, -+ Window w, -+ _Xconst char *windowName, -+ _Xconst char *iconName, -+ char **argv, -+ int argc, -+ XSizeHints *sizeHints, -+ XWMHints *wmHints, -+ XClassHint *classHints) -+{ -+ return; -+} -+ -+int -+XmbTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ char ***list_ret, -+ int *count_ret) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextListToTextProperty( -+ Display *dpy, -+ char **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XmbDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XmbTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XmbDrawString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+void -+XmbDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XmbTextEscapement( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XmbTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return 0; -+} -+ -+unsigned int -+KeySymToUcs4(KeySym keysym) -+{ -+ return 0; -+} -+ -+#endif -+ -+#if ! XCMS -+ -+XcmsCCC -+XcmsCCCOfColormap(dpy, cmap) -+ Display *dpy; -+ Colormap cmap; -+{ -+ return NULL; -+} -+ -+Status -+_XcmsResolveColorString ( -+ XcmsCCC ccc, -+ const char **color_string, -+ XcmsColor *pColor_exact_return, -+ XcmsColorFormat result_format) -+{ -+ return(XcmsFailure); -+} -+ -+void -+_XcmsUnresolveColor( -+ XcmsCCC ccc, -+ XcmsColor *pColor) -+{ -+ return; -+} -+ -+void -+_XUnresolveColor( -+ XcmsCCC ccc, -+ XColor *pXColor) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsAddCmapRec(dpy, cmap, windowID, visual) -+ Display *dpy; -+ Colormap cmap; -+ Window windowID; -+ Visual *visual; -+{ -+ return NULL; -+} -+ -+void -+_XcmsRGB_to_XColor( -+ XcmsColor *pColors, -+ XColor *pXColors, -+ unsigned int nColors) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsCopyCmapRecAndFree( -+ Display *dpy, -+ Colormap src_cmap, -+ Colormap copy_cmap) -+{ -+ return NULL; -+} -+ -+void -+_XcmsDeleteCmapRec( -+ Display *dpy, -+ Colormap cmap) -+{ -+ return; -+} -+ -+#endif ---- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100 -@@ -331,6 +331,8 @@ - libX11_la_SOURCES+=UIThrStubs.c - endif - -+libX11_la_SOURCES+=X18NCMSstubs.c -+ - x11datadir = @X11_DATADIR@ - x11data_DATA = XKeysymDB XErrorDB - -@@ -338,7 +340,8 @@ - $(x11data_DATA) \ - os2Stubs.c \ - udcInf.c \ -- UIThrStubs.c -+ UIThrStubs.c \ -+ X18NCMSstubs.c - - # - # Figure out which sub-libraries to link into Xlib ---- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100 -@@ -55,7 +55,9 @@ - #define NUM_FREE_CVLS 4 - - /* in lcWrap.c */ -+#ifdef XLOCALE - extern LockInfoPtr _Xi18n_lock; -+#endif - - #ifdef WIN32 - static DWORD _X_TlsIndex = (DWORD)-1; -@@ -625,9 +627,11 @@ - _Xglobal_lock = &global_lock; - xmutex_init(_Xglobal_lock->lock); - xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); -+#ifdef XLOCALE - _Xi18n_lock = &i18n_lock; - xmutex_init(_Xi18n_lock->lock); - xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); -+#endif - _XLockMutex_fn = _XLockMutex; - _XUnlockMutex_fn = _XUnlockMutex; - _XCreateMutex_fn = _XCreateMutex; ---- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100 -@@ -215,7 +215,14 @@ - esac - AC_SUBST(KEYSYMDEF) - --AM_CONDITIONAL(UDC, test xfalse = xtrue) -+AC_ARG_ENABLE(udc, -+ AC_HELP_STRING([--disable-udc], -+ [Disable Xlib support for UDC *EXPERIMENTAL*]), -+ [UDC=$enableval],[UDC=yes]) -+AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) -+if test x"$UDC" = "xyes"; then -+ AC_DEFINE(UDC,1,[Include support for UDC]) -+fi - - AC_ARG_ENABLE(xcms, - AC_HELP_STRING([--disable-xcms], diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xlibs/diet-x11/fix-disable-xlocale.diff deleted file mode 100644 index 9dbf6dac68..0000000000 --- a/packages/xlibs/diet-x11/fix-disable-xlocale.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 -@@ -701,7 +701,11 @@ - } - if (l - 2 - (p - charset) < 0) - return 0; -+#ifdef XLOCALE - if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) -+#else -+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) -+#endif - return 0; - if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) - return 0; diff --git a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch b/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch deleted file mode 100644 index a098db1941..0000000000 --- a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h -@@ -103,7 +103,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/packages/xlibs/diet-x11_20050226.bb b/packages/xlibs/diet-x11_20050226.bb deleted file mode 100644 index cab8c5d570..0000000000 --- a/packages/xlibs/diet-x11_20050226.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "x11/base" -include libx11_${PV}.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/xlibs/diet-x11_6.2.1.bb b/packages/xlibs/diet-x11_6.2.1.bb deleted file mode 100644 index 643e658412..0000000000 --- a/packages/xlibs/diet-x11_6.2.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SECTION = "x11/base" -include libx11_${PV}.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ - file://xim.patch;patch=1" - diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb deleted file mode 100644 index 3e09f9a4b8..0000000000 --- a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/base" -include libx11_${PV}.bb - -PROVIDES += "libx11" - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" - -#do_stage_append () { -# rm -f ${STAGING_INCDIR}/X11/XKBlib.h -#} diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb deleted file mode 100644 index 747c525535..0000000000 --- a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "x11/base" -include libx11_${PV}.bb - -PROVIDES += "libx11" - -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/xlibs/diet-x11_cvs.bb b/packages/xlibs/diet-x11_cvs.bb deleted file mode 100644 index eea73f0964..0000000000 --- a/packages/xlibs/diet-x11_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -SECTION = "x11/base" -include libx11_cvs.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ - file://xim.patch;patch=1" diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/xlibs/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/files/errordb-keysymdb-path-fix.patch b/packages/xlibs/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065e..0000000000 --- a/packages/xlibs/files/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 -+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 -@@ -56,7 +56,7 @@ - #include - - #ifndef ERRORDB --#define ERRORDB "/usr/lib/X11/XErrorDB" -+#define ERRORDB "/usr/share/X11/XErrorDB" - #endif - - /* ---- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 -+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 -@@ -36,7 +36,7 @@ - #include "Key.h" - - #ifndef KEYSYMDB --#define KEYSYMDB "/usr/lib/X11/XKeysymDB" -+#define KEYSYMDB "/usr/share/X11/XKeysymDB" - #endif - - static Bool initialized; diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xlibs/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba92..0000000000 --- a/packages/xlibs/files/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-6.2.1/include/X11/Xlib.h -@@ -100,7 +100,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb deleted file mode 100644 index 02883c4d26..0000000000 --- a/packages/xlibs/libfontenc_1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X fontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "zlib xproto" - -XORG_PN = "${PN}" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb deleted file mode 100644 index b67c4a0e38..0000000000 --- a/packages/xlibs/libfontenc_1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X fontenc library (used by libxfont)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "zlib xproto" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libice/.mtn2git_empty b/packages/xlibs/libice/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libice/autofoo.patch b/packages/xlibs/libice/autofoo.patch deleted file mode 100644 index 8ab0585fb8..0000000000 --- a/packages/xlibs/libice/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400 -+++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500 -@@ -8,12 +8,12 @@ - libICE) - - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xlibs/libice_6.3.3.bb b/packages/xlibs/libice_6.3.3.bb deleted file mode 100644 index 1311145334..0000000000 --- a/packages/xlibs/libice_6.3.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "libs" -LICENSE= "MIT" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "libx11" -PROVIDES = "ice" -DESCRIPTION = "X11 ICE library" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libICE-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb deleted file mode 100644 index cd5c2d372f..0000000000 --- a/packages/xlibs/libice_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X11 ICE library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "libx11 util-macros" -PROVIDES = "ice" - -XORG_PN = "libICE" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb deleted file mode 100644 index a1e92b66fa..0000000000 --- a/packages/xlibs/libice_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X11 ICE library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "libx11 util-macros" -PROVIDES = "ice" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libICE" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libice_cvs.bb b/packages/xlibs/libice_cvs.bb deleted file mode 100644 index 90c98d594a..0000000000 --- a/packages/xlibs/libice_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libx11" -PROVIDES = "ice" -DESCRIPTION = "X11 ICE library" -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE" -S = "${WORKDIR}/ICE" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/liblbxutil/.mtn2git_empty b/packages/xlibs/liblbxutil/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xlibs/liblbxutil/mkg3states.patch deleted file mode 100644 index 58463db46b..0000000000 --- a/packages/xlibs/liblbxutil/mkg3states.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 -+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 -@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) ---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 -+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 -@@ -1,9 +1,6 @@ - lib_LTLIBRARIES = liblbxutil.la - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 - ---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 -+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xlibs/liblbxutil_1.0.0.bb deleted file mode 100644 index 36837c23e4..0000000000 --- a/packages/xlibs/liblbxutil_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "xextproto" - -XORG_PN = "${PN}" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \ - file://mkg3states.patch;patch=1" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb deleted file mode 100644 index 795cd4555d..0000000000 --- a/packages/xlibs/liblbxutil_1.0.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "xproto" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \ - file://mkg3states.patch;patch=1" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" diff --git a/packages/xlibs/libsm/.mtn2git_empty b/packages/xlibs/libsm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libsm/autofoo.patch b/packages/xlibs/libsm/autofoo.patch deleted file mode 100644 index 8cb204a66e..0000000000 --- a/packages/xlibs/libsm/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libSM-6.0.3/configure.ac~autofoo 2004-05-11 01:51:21.000000000 -0400 -+++ libSM-6.0.3/configure.ac 2005-01-18 12:15:50.405356376 -0500 -@@ -8,12 +8,12 @@ - libSM) - - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xlibs/libsm_6.0.3.bb b/packages/xlibs/libsm_6.0.3.bb deleted file mode 100644 index 08f9597045..0000000000 --- a/packages/xlibs/libsm_6.0.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "libs" -LICENSE = "MIT-X" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "libx11 libice" -DESCRIPTION = "Session management library" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libSM-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb deleted file mode 100644 index bf96271ba6..0000000000 --- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Session management library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT-X" -#PV="1:1.0.0" - -DEPENDS = "libx11 libice util-macros" - -XORG_PN = "libSM" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb deleted file mode 100644 index 468b014165..0000000000 --- a/packages/xlibs/libsm_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Session management library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT-X" -#PV="1:1.0.1" - -DEPENDS = "libx11 libice util-macros" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libSM" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libsm_cvs.bb b/packages/xlibs/libsm_cvs.bb deleted file mode 100644 index 22b316cf57..0000000000 --- a/packages/xlibs/libsm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "6.0.3+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libx11 libice" -DESCRIPTION = "Session management library" -PR = "r1" - -DEFAULT_PREFERENCE="-1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM" -S = "${WORKDIR}/SM" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb deleted file mode 100644 index 9513c4237e..0000000000 --- a/packages/xlibs/libx11-native_6.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -include libx11_${PV}.bb -inherit native -DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" -PROVIDES = "" diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xlibs/libx11-native_cvs.bb deleted file mode 100644 index 5b221122d3..0000000000 --- a/packages/xlibs/libx11-native_cvs.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "x11/base" -include libx11_cvs.bb -inherit native -DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" -PROVIDES = "" diff --git a/packages/xlibs/libx11/.mtn2git_empty b/packages/xlibs/libx11/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libx11/autofoo.patch b/packages/xlibs/libx11/autofoo.patch deleted file mode 100644 index 8bdba09768..0000000000 --- a/packages/xlibs/libx11/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/configure.ac~autofoo -+++ libX11-6.2.1/configure.ac -@@ -7,12 +7,12 @@ - [jg@freedesktop.org], - libX11) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -+AC_CONFIG_AUX_DIR(.) - -+AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([src/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xlibs/libx11/xim.patch b/packages/xlibs/libx11/xim.patch deleted file mode 100644 index 0eab197a80..0000000000 --- a/packages/xlibs/libx11/xim.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000 -+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000 -@@ -90,6 +90,52 @@ - return; - } - -+XIM -+XOpenIM ( -+ Display* display, -+ struct _XrmHashBucketRec* rdb, -+ char* res_name, -+ char* res_class) -+{ -+ return (XIM) NULL; -+} -+ -+Status -+XCloseIM ( XIM im ) -+{ -+ return NULL; -+} -+ -+XIC -+XCreateIC ( XIM im, ...) -+{ -+ return NULL; -+} -+ -+void -+XDestroyIC ( XIC ic ) -+{ -+ return; -+} -+ -+int -+XmbLookupString ( -+ XIC ic, -+ XKeyPressedEvent* ev, -+ char* buffer, -+ int nbytes, -+ KeySym* keysym, -+ Status* status) -+{ -+ return XLookupNone; -+} -+ -+char * -+XGetICValues( XIC ic, ...) -+{ -+ return (char *) NULL; -+} -+ - XPointer - _XimGetLocaleCode ( _Xconst char* encoding_name ) - { diff --git a/packages/xlibs/libx11_20050226.bb b/packages/xlibs/libx11_20050226.bb deleted file mode 100644 index 0bc30a42cc..0000000000 --- a/packages/xlibs/libx11_20050226.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRCDATE = "20050226" - -include libx11_cvs.bb - -DEFAULT_PREFERENCE = "0" - diff --git a/packages/xlibs/libx11_6.2.1.bb b/packages/xlibs/libx11_6.2.1.bb deleted file mode 100644 index 901746bafa..0000000000 --- a/packages/xlibs/libx11_6.2.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "XFree86" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "x11" -DESCRIPTION = "Base X libs." -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" -PR = "r4" - -SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ - file://errordb-keysymdb-path-fix.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libX11-${PV}" - -inherit autotools pkgconfig - -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys - ) - oe_runmake -} - -do_stage() { - install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h - install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h - install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h - install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h - install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h - install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h - install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h - install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h - install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h - - oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb deleted file mode 100644 index ac9d87292a..0000000000 --- a/packages/xlibs/libx11_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" - -DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "x11" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - -XORG_PN = "libX11" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - rm -f ${STAGING_INCDIR}/X11/Xlib.h - oe_runmake -} diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb deleted file mode 100644 index 6836c872bd..0000000000 --- a/packages/xlibs/libx11_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Base X libs." -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" - -DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "x11" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - -XORG_PN = "libX11" -XORG_RELEASE = "X11R7.1" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - rm -f ${STAGING_INCDIR}/X11/Xlib.h - oe_runmake -} diff --git a/packages/xlibs/libx11_cvs.bb b/packages/xlibs/libx11_cvs.bb deleted file mode 100644 index d44dd76aac..0000000000 --- a/packages/xlibs/libx11_cvs.bb +++ /dev/null @@ -1,41 +0,0 @@ -PV = "6.2.1+cvs${SRCDATE}" -LICENSE = "XFree86" -PR = "r6" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "x11" -DESCRIPTION = "Base X libs." -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \ - file://errordb-keysymdb-path-fix.patch;patch=1" -S = "${WORKDIR}/X11" - -inherit autotools pkgconfig - -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys - ) - rm -f ${STAGING_INCDIR}/X11/Xlib.h - oe_runmake -} - -do_stage() { - install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h - install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h - install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h - install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h - install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h - install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h - install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h - install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h - install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h - - oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libx11_git.bb b/packages/xlibs/libx11_git.bb deleted file mode 100644 index ed6623f03a..0000000000 --- a/packages/xlibs/libx11_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE = "XFree86" - -DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "x11" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - rm -f ${STAGING_INCDIR}/X11/Xlib.h - oe_runmake -} - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xlibs/libxau-native_0.1.1.bb deleted file mode 100644 index ecb71ce3d6..0000000000 --- a/packages/xlibs/libxau-native_0.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_${PV}.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xlibs/libxau-native_cvs.bb deleted file mode 100644 index cd070033ce..0000000000 --- a/packages/xlibs/libxau-native_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "x11/base" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" -include libxau_cvs.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" diff --git a/packages/xlibs/libxau/.mtn2git_empty b/packages/xlibs/libxau/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxau/autofoo.patch b/packages/xlibs/libxau/autofoo.patch deleted file mode 100644 index 1e42eb974d..0000000000 --- a/packages/xlibs/libxau/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXau-0.1.1/configure.ac~autofoo -+++ libXau-0.1.1/configure.ac -@@ -25,11 +25,10 @@ - - AC_PREREQ([2.57]) - AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau) --AM_INIT_AUTOMAKE([dist-bzip2]) --AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE - - AC_PROG_CC - AC_PROG_INSTALL diff --git a/packages/xlibs/libxau_0.1.1.bb b/packages/xlibs/libxau_0.1.1.bb deleted file mode 100644 index dc1a28171b..0000000000 --- a/packages/xlibs/libxau_0.1.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -PROVIDES = "xau" -DESCRIPTION = "Authorization Protocol for X." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXau-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb deleted file mode 100644 index f64be68583..0000000000 --- a/packages/xlibs/libxau_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Authorization Protocol for X." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto util-macros" -PROVIDES = "xau" - -XORG_PN = "libXau" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb deleted file mode 100644 index 39e2f88b95..0000000000 --- a/packages/xlibs/libxau_1.0.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Authorization Protocol for X." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto util-macros" -PROVIDES = "xau" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXau" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxau_cvs.bb b/packages/xlibs/libxau_cvs.bb deleted file mode 100644 index 518744816d..0000000000 --- a/packages/xlibs/libxau_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -PR = "r1" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -PROVIDES = "xau" -DESCRIPTION = "Authorization Protocol for X." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau" -S = "${WORKDIR}/Xau" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxaw/.mtn2git_empty b/packages/xlibs/libxaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxaw/auxdir.patch b/packages/xlibs/libxaw/auxdir.patch deleted file mode 100644 index 4226ab6a4d..0000000000 --- a/packages/xlibs/libxaw/auxdir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.ac 2005-06-17 21:26:17.519157272 +0200 -+++ libXaw-7.0.2/configure.ac 2005-06-17 21:26:34.832525240 +0200 -@@ -10,7 +10,6 @@ - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxaw_7.0.2.bb b/packages/xlibs/libxaw_7.0.2.bb deleted file mode 100644 index 929b54a127..0000000000 --- a/packages/xlibs/libxaw_7.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "xproto libx11 libxt libxmu libxpm" -PROVIDES = "xaw" -DESCRIPTION = "X Athena Widgets library" - -SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \ - file://auxdir.patch;patch=1" - -S = "${WORKDIR}/libXaw-${PV}" - -inherit autotools pkgconfig - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb deleted file mode 100644 index 03ac373f77..0000000000 --- a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "X Athena Widgets library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "xproto libx11 libxt libxmu libxpm" -PROVIDES = "xaw" - -XORG_PN = "libXaw" - -include xorg-xlibs.inc - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb deleted file mode 100644 index 7fb68385a1..0000000000 --- a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "X Athena Widgets library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "xproto libx11 libxt libxmu libxpm" -PROVIDES = "xaw" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXaw" - -include xorg-xlibs.inc - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" diff --git a/packages/xlibs/libxaw_cvs.bb b/packages/xlibs/libxaw_cvs.bb deleted file mode 100644 index 7860f6e6b1..0000000000 --- a/packages/xlibs/libxaw_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xproto libx11 libxt libxmu libxpm" -PROVIDES = "xaw" -DESCRIPTION = "X Athena Widgets library" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw" -S = "${WORKDIR}/Xaw" - -inherit autotools pkgconfig - -# FIXME: libXaw needs a full x11, not diet -BROKEN = "1" - -do_stage () { - oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} -} diff --git a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty b/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/packages/xlibs/libxcomposite-1.0.1/autofoo.patch deleted file mode 100644 index 072cf25214..0000000000 --- a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXcomposite-1.0.1/configure.ac -=================================================================== ---- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500 -+++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xlibs/libxcomposite/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xlibs/libxcomposite/change-include-order.patch deleted file mode 100644 index 630b8818fc..0000000000 --- a/packages/xlibs/libxcomposite/change-include-order.patch +++ /dev/null @@ -1,14 +0,0 @@ -This patch makes the build use its own Xcomposite.h over rather than an -older Xcomposite.h that might already be installed in the staging dir. - ---- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 -+++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 -@@ -21,7 +21,7 @@ - # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - # PERFORMANCE OF THIS SOFTWARE. - --AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include -+AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) - - lib_LTLIBRARIES = libXcomposite.la - diff --git a/packages/xlibs/libxcomposite_1.0.1.bb b/packages/xlibs/libxcomposite_1.0.1.bb deleted file mode 100644 index e2ca3bbc7b..0000000000 --- a/packages/xlibs/libxcomposite_1.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "libx11 compositeext xextensions libxfixes" -PROVIDES = "xcomposite" -DESCRIPTION = "X Composite extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXcomposite-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb deleted file mode 100644 index d3166a99f4..0000000000 --- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "X Composite extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 compositeproto xextproto libxfixes" -PROVIDES = "xcomposite" - -XORG_PN = "libXcomposite" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \ - file://change-include-order.patch;patch=1" diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb deleted file mode 100644 index 2847ada716..0000000000 --- a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "X Composite extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 compositeproto libxfixes" -PROVIDES = "xcomposite" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXcomposite" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \ - file://change-include-order.patch;patch=1" diff --git a/packages/xlibs/libxcomposite_cvs.bb b/packages/xlibs/libxcomposite_cvs.bb deleted file mode 100644 index 1d8b69c8c6..0000000000 --- a/packages/xlibs/libxcomposite_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -DEPENDS = "libx11 compositeext xextensions libxfixes" -PROVIDES = "xcomposite" -DESCRIPTION = "X Composite extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite" -S = "${WORKDIR}/Xcomposite" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty b/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/packages/xlibs/libxcursor-1.1.2/autofoo.patch deleted file mode 100644 index 99cd45a7ea..0000000000 --- a/packages/xlibs/libxcursor-1.1.2/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXcursor-1.1.2/configure.ac~autofoo 2004-01-16 23:38:26.000000000 -0500 -+++ libXcursor-1.1.2/configure.ac 2005-01-18 13:40:06.539707120 -0500 -@@ -31,11 +31,11 @@ - dnl not possible to extract the version number here from Xcursor.h - dnl - AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - dnl libtool versioning - diff --git a/packages/xlibs/libxcursor/.mtn2git_empty b/packages/xlibs/libxcursor/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxcursor/autofoo.patch b/packages/xlibs/libxcursor/autofoo.patch deleted file mode 100644 index 7aa573ce13..0000000000 --- a/packages/xlibs/libxcursor/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: Xcursor/configure.ac -=================================================================== ---- Xcursor.orig/configure.ac 2004-04-12 10:11:12.000000000 -0400 -+++ Xcursor/configure.ac 2005-01-18 16:04:36.860617992 -0500 -@@ -31,11 +31,11 @@ - dnl not possible to extract the version number here from Xcursor.h - dnl - AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_SRCDIR([Makefile.am]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - dnl libtool versioning - diff --git a/packages/xlibs/libxcursor_1.1.2.bb b/packages/xlibs/libxcursor_1.1.2.bb deleted file mode 100644 index 25744c7dca..0000000000 --- a/packages/xlibs/libxcursor_1.1.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DESCRIPTION = "X Cursor library" -DEPENDS = "libxfixes" -PR = "r2" - -SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXcursor-${PV}" -FILES_${PN} += "${libdir}/libXcursor.so" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb deleted file mode 100644 index 9aed134fbb..0000000000 --- a/packages/xlibs/libxcursor_1.1.5.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X Cursor library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libxfixes" - -XORG_PN = "libXcursor" - -include xorg-xlibs.inc - -FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb deleted file mode 100644 index 20f44bfb41..0000000000 --- a/packages/xlibs/libxcursor_1.1.6.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "X Cursor library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libxfixes" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXcursor" - -include xorg-xlibs.inc - -FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xlibs/libxcursor_cvs.bb b/packages/xlibs/libxcursor_cvs.bb deleted file mode 100644 index 5fe2334b85..0000000000 --- a/packages/xlibs/libxcursor_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -PRIORITY = "optional" -DESCRIPTION = "X Cursor library" -DEPENDS = "libxfixes" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor" -S = "${WORKDIR}/Xcursor" -FILES_${PN} += "${libdir}/libXcursor.so" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty b/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/packages/xlibs/libxdamage-1.0.1/autofoo.patch deleted file mode 100644 index 1e3ec45d4a..0000000000 --- a/packages/xlibs/libxdamage-1.0.1/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libXdamage-1.0.1/configure.ac -=================================================================== ---- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500 -+++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxdamage/.mtn2git_empty b/packages/xlibs/libxdamage/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxdamage/m4.patch b/packages/xlibs/libxdamage/m4.patch deleted file mode 100644 index 393f3d13d2..0000000000 --- a/packages/xlibs/libxdamage/m4.patch +++ /dev/null @@ -1,65 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null -+++ Xdamage/m4/pkg.m4 -@@ -0,0 +1,57 @@ -+ -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi -+ -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi -+]) -+ -+ diff --git a/packages/xlibs/libxdamage_1.0.1.bb b/packages/xlibs/libxdamage_1.0.1.bb deleted file mode 100644 index 040e863447..0000000000 --- a/packages/xlibs/libxdamage_1.0.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "libx11 damageext libxfixes xproto" -PROVIDES = "xdamage" -DESCRIPTION = "X Damage extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ - file://m4.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXdamage-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb deleted file mode 100644 index acea09c7bd..0000000000 --- a/packages/xlibs/libxdamage_1.0.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X Damage extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 damageproto libxfixes xproto" -PROVIDES = "xdamage" - -XORG_PN = "libXdamage" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb deleted file mode 100644 index b97e01cfb0..0000000000 --- a/packages/xlibs/libxdamage_1.0.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Damage extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 damageproto libxfixes xproto" -PROVIDES = "xdamage" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXdamage" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxdamage_cvs.bb b/packages/xlibs/libxdamage_cvs.bb deleted file mode 100644 index ba8a68033a..0000000000 --- a/packages/xlibs/libxdamage_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -DEPENDS = "libx11 damageext libxfixes xproto" -PROVIDES = "xdamage" -DESCRIPTION = "X Damage extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \ - file://m4.patch;patch=1" -S = "${WORKDIR}/Xdamage" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxdmcp-native_0.1.1.bb b/packages/xlibs/libxdmcp-native_0.1.1.bb deleted file mode 100644 index bd6d990f53..0000000000 --- a/packages/xlibs/libxdmcp-native_0.1.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "x11/libs" -include libxdmcp_${PV}.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xlibs/libxdmcp-native_0.1.3.bb deleted file mode 100644 index 8d7162b351..0000000000 --- a/packages/xlibs/libxdmcp-native_0.1.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "x11/libs" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" -include libxdmcp_${PV}.bb -inherit native -DEPENDS = "xproto-native" -PROVIDES = "" diff --git a/packages/xlibs/libxdmcp/.mtn2git_empty b/packages/xlibs/libxdmcp/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxdmcp/autofoo.patch b/packages/xlibs/libxdmcp/autofoo.patch deleted file mode 100644 index ff1a76ad04..0000000000 --- a/packages/xlibs/libxdmcp/autofoo.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXdmcp-0.1.3/configure.ac~autofoo -+++ libXdmcp-0.1.3/configure.ac -@@ -25,12 +25,11 @@ - - AC_PREREQ([2.57]) - AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp) -+AC_CONFIG_AUX_DIR(.) -+AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) --AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) - - AC_PROG_CC - AC_PROG_INSTALL diff --git a/packages/xlibs/libxdmcp_0.1.1.bb b/packages/xlibs/libxdmcp_0.1.1.bb deleted file mode 100644 index 19fba1529e..0000000000 --- a/packages/xlibs/libxdmcp_0.1.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -PROVIDES = "xdmcp" -DESCRIPTION = "X Display Manager Control Protocol library." -PR = "r1" -S = "${WORKDIR}/libXdmcp-${PV}" - -SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxdmcp_0.1.3.bb b/packages/xlibs/libxdmcp_0.1.3.bb deleted file mode 100644 index aa2736cdb2..0000000000 --- a/packages/xlibs/libxdmcp_0.1.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE= "MIT" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -PROVIDES = "xdmcp" -DESCRIPTION = "X Display Manager Control Protocol library." -PR = "r1" -S = "${WORKDIR}/libXdmcp-${PV}" - -SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb deleted file mode 100644 index 5ea8cdd513..0000000000 --- a/packages/xlibs/libxdmcp_1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Display Manager Control Protocol library." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto util-macros" -PROVIDES = "xdmcp" - -XORG_PN = "libXdmcp" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb deleted file mode 100644 index d9cfadbf7b..0000000000 --- a/packages/xlibs/libxdmcp_1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X Display Manager Control Protocol library." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto util-macros" -PROVIDES = "xdmcp" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXdmcp" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxdmcp_cvs.bb b/packages/xlibs/libxdmcp_cvs.bb deleted file mode 100644 index 20b957b522..0000000000 --- a/packages/xlibs/libxdmcp_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -PR = "r1" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto" -PROVIDES = "xdmcp" -DESCRIPTION = "X Display Manager Control Protocol library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp" -S = "${WORKDIR}/Xdmcp" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb deleted file mode 100644 index 9294b080b7..0000000000 --- a/packages/xlibs/libxext-native_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "unknown" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" -include libxext_${PV}.bb -inherit native -DEPENDS = "libx11-native xextensions-native" -PROVIDES = "" diff --git a/packages/xlibs/libxext/.mtn2git_empty b/packages/xlibs/libxext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxext/autofoo.patch b/packages/xlibs/libxext/autofoo.patch deleted file mode 100644 index c006884526..0000000000 --- a/packages/xlibs/libxext/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Xext/configure.ac~autofoo -+++ Xext/configure.ac -@@ -8,9 +8,8 @@ - libXext) - - AC_CONFIG_SRCDIR([Makefile.am]) --AM_INIT_AUTOMAKE([dist-bzip2]) -- - AC_CONFIG_AUX_DIR(.) -+AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb deleted file mode 100644 index 1c4a21280e..0000000000 --- a/packages/xlibs/libxext_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto libx11 xextproto util-macros" -PROVIDES = "xext" - -EXTRA_OECONF="--enable-malloc0returnsnull" - -XORG_PN = "libXext" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb deleted file mode 100644 index 5ee1d82990..0000000000 --- a/packages/xlibs/libxext_1.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE= "MIT" - -DEPENDS = "xproto libx11 util-macros" -PROVIDES = "xext" - -EXTRA_OECONF="--enable-malloc0returnsnull" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXext" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxext_cvs.bb b/packages/xlibs/libxext_cvs.bb deleted file mode 100644 index 0ef675ca70..0000000000 --- a/packages/xlibs/libxext_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -PR = "r1" -LICENSE= "MIT" -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xproto libx11 xextensions" -PROVIDES = "xext" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" -S = "${WORKDIR}/Xext" - -inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxfixes/.mtn2git_empty b/packages/xlibs/libxfixes/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxfixes/autofoo.patch b/packages/xlibs/libxfixes/autofoo.patch deleted file mode 100644 index 26803cf7f3..0000000000 --- a/packages/xlibs/libxfixes/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXfixes-2.0.1/configure.ac~autofoo 2004-01-15 03:40:23.000000000 -0500 -+++ libXfixes-2.0.1/configure.ac 2005-01-18 13:35:33.461221360 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxfixes_2.0.1.bb b/packages/xlibs/libxfixes_2.0.1.bb deleted file mode 100644 index 710fa17454..0000000000 --- a/packages/xlibs/libxfixes_2.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "libx11 fixesext" -DESCRIPTION = "X Fixes extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXfixes-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb deleted file mode 100644 index b22da223f5..0000000000 --- a/packages/xlibs/libxfixes_3.0.1.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X Fixes extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 fixesproto" - -XORG_PN = "libXfixes" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb deleted file mode 100644 index 5b8881e0b8..0000000000 --- a/packages/xlibs/libxfixes_4.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X Fixes extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE= "BSD-X" - -DEPENDS = "libx11 fixesproto" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXfixes" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxfixes_cvs.bb b/packages/xlibs/libxfixes_cvs.bb deleted file mode 100644 index 4494dc9326..0000000000 --- a/packages/xlibs/libxfixes_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "x11/libs" -DEPENDS = "libx11 fixesext" -DESCRIPTION = "X Fixes extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" -S = "${WORKDIR}/Xfixes" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxfont/.mtn2git_empty b/packages/xlibs/libxfont/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxfont/autofoo.patch b/packages/xlibs/libxfont/autofoo.patch deleted file mode 100644 index 4998625c24..0000000000 --- a/packages/xlibs/libxfont/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 -+++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 -@@ -35,9 +35,9 @@ - dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's - dnl not possible to extract the version number here from Xfont.h - dnl -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) - - # Check for progs diff --git a/packages/xlibs/libxfont/scalable.patch b/packages/xlibs/libxfont/scalable.patch deleted file mode 100644 index 7f97b9a8f6..0000000000 --- a/packages/xlibs/libxfont/scalable.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: fontfile/fontdir.c -=================================================================== -RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v -retrieving revision 3.22 -diff -u -r3.22 fontdir.c ---- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 -+++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 -@@ -699,6 +699,11 @@ - */ - if (isscale) - { -+ /* If the fontname says it is scalable, make sure that the -+ * renderer supports OpenScalable and GetInfoScalable. -+ */ -+ if (renderer->OpenScalable && renderer->GetInfoScalable) -+ { - if (vals.values_supplied & SIZE_SPECIFY_MASK) - { - bzero((char *)&zeroVals, sizeof(zeroVals)); -@@ -798,6 +803,7 @@ - bitmap->name.name); - } - } -+ } - } - return TRUE; - } diff --git a/packages/xlibs/libxfont_1.4.2.bb b/packages/xlibs/libxfont_1.4.2.bb deleted file mode 100644 index 0cc45397fe..0000000000 --- a/packages/xlibs/libxfont_1.4.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xtrans zlib" -PROVIDES = "xfont" -DESCRIPTION = "X font library (used by the X server)." -PR = "r2" - -SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ - file://scalable.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXfont-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb deleted file mode 100644 index aff0e55e21..0000000000 --- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype" -PROVIDES = "xfont" - -XORG_PN = "libXfont" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb deleted file mode 100644 index d17359dc29..0000000000 --- a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" -PROVIDES = "xfont" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXfont" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb b/packages/xlibs/libxfont_X11R7.1-1.2.0.bb deleted file mode 100644 index 2701aef825..0000000000 --- a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "X font library (used by the X server)." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" -PROVIDES = "xfont" - -XORG_PN = "libXfont" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-1.2.0" diff --git a/packages/xlibs/libxfont_cvs.bb b/packages/xlibs/libxfont_cvs.bb deleted file mode 100644 index bd21e0fd12..0000000000 --- a/packages/xlibs/libxfont_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "BSD-X" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xtrans zlib" -PROVIDES = "xfont" -DESCRIPTION = "X font library (used by the X server)." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \ - file://scalable.patch;patch=1" -S = "${WORKDIR}/Xfont" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxft/.mtn2git_empty b/packages/xlibs/libxft/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxft/autofoo.patch b/packages/xlibs/libxft/autofoo.patch deleted file mode 100644 index 54120aa612..0000000000 --- a/packages/xlibs/libxft/autofoo.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXft-2.1.6/configure.ac~autofoo 2004-03-22 10:02:59.000000000 -0500 -+++ libXft-2.1.6/configure.ac 2005-01-17 02:08:10.165951760 -0500 -@@ -33,12 +33,12 @@ - dnl Please bump the minor library number at each release as well. - dnl - AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft) -+AC_CONFIG_AUX_DIR(.) - - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # checks for progs - AC_PROG_CC diff --git a/packages/xlibs/libxft_2.1.6.bb b/packages/xlibs/libxft_2.1.6.bb deleted file mode 100644 index c3f1f74e40..0000000000 --- a/packages/xlibs/libxft_2.1.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "libx11 xproto libxrender freetype fontconfig" -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -PROVIDES = "xft" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXft-${PV}" - -FILES_${PN} = ${libdir}/lib*.so.* -FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir} - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb deleted file mode 100644 index f1b6456740..0000000000 --- a/packages/xlibs/libxft_2.1.8.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -LICENSE = "MIT-X" -SECTION = "x11/libs" - -DEPENDS = "libx11 xproto libxrender freetype fontconfig" -PROVIDES = "xft" - - -XORG_PN = "libXft" - -include xorg-xlibs.inc - -FILES_${PN} = ${libdir}/lib*.so.* -FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/packages/xlibs/libxft_cvs.bb b/packages/xlibs/libxft_cvs.bb deleted file mode 100644 index 6c1a5f5c32..0000000000 --- a/packages/xlibs/libxft_cvs.bb +++ /dev/null @@ -1,26 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "x11/libs" -DEPENDS = "libx11 xproto libxrender freetype fontconfig" -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -PROVIDES = "xft" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft" -S = "${WORKDIR}/Xft" - -FILES_${PN} = ${libdir}/lib*.so.* -FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir} - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} diff --git a/packages/xlibs/libxi/.mtn2git_empty b/packages/xlibs/libxi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxi/autofoo.patch b/packages/xlibs/libxi/autofoo.patch deleted file mode 100644 index f1bce9ed7a..0000000000 --- a/packages/xlibs/libxi/autofoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libXi-6.0.1/configure.ac -=================================================================== ---- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500 -+++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500 -@@ -8,7 +8,6 @@ - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xlibs/libxi_6.0.1.bb b/packages/xlibs/libxi_6.0.1.bb deleted file mode 100644 index 5c44d06df3..0000000000 --- a/packages/xlibs/libxi_6.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "X Input Extension library" -LICENSE = "MIT-X" -SECTION = "x11/libs" -DEPENDS = "xproto libx11 xextensions" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXi-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb deleted file mode 100644 index 4e357cde7c..0000000000 --- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X Input extension library." -SECTION = "x11/libs" -LICENSE = "MIT-X" - -DEPENDS = "xproto libx11 libxext" - -XORG_PN = "libXi" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb deleted file mode 100644 index d698f04ee1..0000000000 --- a/packages/xlibs/libxi_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Input extension library." -SECTION = "x11/libs" -LICENSE = "MIT-X" - -DEPENDS = "xproto libx11 libxext" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXi" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxi_cvs.bb b/packages/xlibs/libxi_cvs.bb deleted file mode 100644 index 767c641a95..0000000000 --- a/packages/xlibs/libxi_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "x11/libs" -DEPENDS = "xproto libx11 xextensions" -DESCRIPTION = "X Input extension library." -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/Xi" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb b/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb deleted file mode 100644 index dc5d82b9b0..0000000000 --- a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Xinerama library" -LICENSE = "MIT" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "panoramixext xproto libx11 libxext" -PROVIDES = "xinerama" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" -S = "${WORKDIR}/Xinerama" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxinerama_1.0.2.bb b/packages/xlibs/libxinerama_1.0.2.bb deleted file mode 100644 index a267e6c2d9..0000000000 --- a/packages/xlibs/libxinerama_1.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "MIT" -DESCRIPTION = "Xinerama library" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "panoramixext xproto libx11 libxext" -PROVIDES = "xinerama" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2" -S = "${WORKDIR}/libXinerama-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb deleted file mode 100644 index 09a4f564f5..0000000000 --- a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Xinerama library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "xineramaproto xproto libx11 libxext" -PROVIDES = "xinerama" - -XORG_PN = "libXinerama" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxinerama_cvs.bb b/packages/xlibs/libxinerama_cvs.bb deleted file mode 100644 index 3e959df19e..0000000000 --- a/packages/xlibs/libxinerama_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Xinerama library" -LICENSE = "MIT" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "panoramixext xproto libx11 libxext" -PROVIDES = "xinerama" -PV = "0.0+cvs${SRCDATE}" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama" -S = "${WORKDIR}/Xinerama" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb deleted file mode 100644 index 5cbc9a1150..0000000000 --- a/packages/xlibs/libxkbfile_1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11" - -XORG_PN = "${PN}" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb deleted file mode 100644 index 36e3e5f600..0000000000 --- a/packages/xlibs/libxkbfile_1.0.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxkbfile_cvs.bb b/packages/xlibs/libxkbfile_cvs.bb deleted file mode 100644 index 1b433ef65f..0000000000 --- a/packages/xlibs/libxkbfile_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "libx11" -DESCRIPTION = "X11 keyboard library" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" -S = "${WORKDIR}/xkbfile" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xlibs/libxkbui_1.0.1.bb deleted file mode 100644 index ded3da66f3..0000000000 --- a/packages/xlibs/libxkbui_1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxt libxkbfile kbproto" - -XORG_PN = "${PN}" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb deleted file mode 100644 index a914f1e0ef..0000000000 --- a/packages/xlibs/libxkbui_1.0.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X11 keyboard library" -SECTION = "libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxt libxkbfile" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "${PN}" - -include xorg-xlibs.inc - diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb deleted file mode 100644 index 1693e5d0d5..0000000000 --- a/packages/xlibs/libxmu_1.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "X Window System miscellaneous utility library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "libxt libxext util-macros" -PROVIDES = "xmu" - -XORG_PN = "libXmu" - -include xorg-xlibs.inc - -PACKAGES =+ "libxmuu libxmuu-dev" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" -FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -LEAD_SONAME = "libXmu" diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb deleted file mode 100644 index cc06d2a671..0000000000 --- a/packages/xlibs/libxmu_1.0.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "X Window System miscellaneous utility library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "libxt libxext util-macros" -PROVIDES = "xmu" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXmu" - -include xorg-xlibs.inc - -PACKAGES =+ "libxmuu libxmuu-dev" - -FILES_libxmuu = "${libdir}/libXmuu.so.*" -FILES_libxmuu-dev = "${libdir}/libXmuu.so" - -LEAD_SONAME = "libXmu" diff --git a/packages/xlibs/libxmu_cvs.bb b/packages/xlibs/libxmu_cvs.bb deleted file mode 100644 index 500b373c32..0000000000 --- a/packages/xlibs/libxmu_cvs.bb +++ /dev/null @@ -1,21 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "libxt libxext" -PROVIDES = "xmu" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu" -S = "${WORKDIR}/Xmu" - -PACKAGES =+ "xmuu xmuu-dev" - -FILES_xmuu = "${libdir}/libXmuu.so.*" -FILES_xmuu-dev = "${libdir}/libXmuu.so" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb deleted file mode 100644 index 15653f1390..0000000000 --- a/packages/xlibs/libxp_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X print extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "MIT" - -DEPENDS = "libx11 libxext xextproto libxau printproto" - -XORG_PN = "libXp" - -include xorg-xlibs.inc - -CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxp_cvs.bb b/packages/xlibs/libxp_cvs.bb deleted file mode 100644 index eaf6546d0e..0000000000 --- a/packages/xlibs/libxp_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ - -LICENSE = "MIT" -PV = "0.0+cvs${SRCDATE}" - -SECTION = "libs" -DEPENDS = "libx11 libxext" -DESCRIPTION = "X print extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" -S = "${WORKDIR}/Xp" - -inherit autotools pkgconfig - -CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxpm/.mtn2git_empty b/packages/xlibs/libxpm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxpm/autofoo.patch b/packages/xlibs/libxpm/autofoo.patch deleted file mode 100644 index 6b2174bf02..0000000000 --- a/packages/xlibs/libxpm/autofoo.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libXpm-3.5.1/configure.ac -=================================================================== ---- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400 -+++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500 -@@ -1,12 +1,12 @@ - AC_PREREQ(2.57) - AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm) - AC_CONFIG_SRCDIR([Makefile.am]) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER([lib/config.h]) --AC_CONFIG_AUX_DIR(.) - - # Checks for programs. - AC_PROG_LIBTOOL diff --git a/packages/xlibs/libxpm_3.5.1.bb b/packages/xlibs/libxpm_3.5.1.bb deleted file mode 100644 index 513261efd3..0000000000 --- a/packages/xlibs/libxpm_3.5.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "X-BSD" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto libx11" -PROVIDES = "xpm" -DESCRIPTION = "X Pixmap library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXpm-${PV}" - -inherit autotools pkgconfig - -do_stage () { - install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb deleted file mode 100644 index c88bd3f6bc..0000000000 --- a/packages/xlibs/libxpm_3.5.4.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "X Pixmap library." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-BSD" -PR = "r1" - -DEPENDS = "xproto libx11 util-macros" - -XORG_PN = "libXpm" - -include xorg-xlibs.inc - -do_stage () { - install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so libXpm ${STAGING_LIBDIR} -} - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb deleted file mode 100644 index 397be2faf4..0000000000 --- a/packages/xlibs/libxpm_3.5.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "X Pixmap library." -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-BSD" - -DEPENDS = "xproto libx11 util-macros" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXpm" - -include xorg-xlibs.inc - -do_stage () { - install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so libXpm ${STAGING_LIBDIR} -} - -PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xlibs/libxpm_cvs.bb b/packages/xlibs/libxpm_cvs.bb deleted file mode 100644 index 1b46855735..0000000000 --- a/packages/xlibs/libxpm_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "X-BSD" -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto libx11" -PROVIDES = "xpm" -DESCRIPTION = "X Pixmap library." -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm" -S = "${WORKDIR}/Xpm" - -inherit autotools pkgconfig - -do_stage () { - install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h - oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty b/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/packages/xlibs/libxrandr-1.0.2/autofoo.patch deleted file mode 100644 index 21f6e7fd78..0000000000 --- a/packages/xlibs/libxrandr-1.0.2/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXrandr-1.0.2/configure.ac~autofoo 2004-01-15 03:23:00.000000000 -0500 -+++ libXrandr-1.0.2/configure.ac 2005-01-16 11:18:35.924069872 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxrandr/.mtn2git_empty b/packages/xlibs/libxrandr/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxrandr/autofoo.patch b/packages/xlibs/libxrandr/autofoo.patch deleted file mode 100644 index 7b1db760f2..0000000000 --- a/packages/xlibs/libxrandr/autofoo.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Xrandr/configure.ac~autofoo.patch 2004-07-01 15:01:55.000000000 -0400 -+++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500 -@@ -33,11 +33,11 @@ - dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC ---- Xrandr/ChangeLog~autofoo.patch 2004-09-19 04:53:38.000000000 -0400 -+++ Xrandr/ChangeLog 2005-01-16 11:52:29.694889712 -0500 -@@ -1,3 +1,7 @@ -+2005-01-16 Chris Larson -+ -+ * configure.ac: Fix to work with automake 1.9.x. -+ - 2004-09-19 Carlos Romero - - * Makefile.am: diff --git a/packages/xlibs/libxrandr_1.0.2.bb b/packages/xlibs/libxrandr_1.0.2.bb deleted file mode 100644 index efd0505544..0000000000 --- a/packages/xlibs/libxrandr_1.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "BSD-X" -DEPENDS = "randrext libx11 libxrender libxext" -DESCRIPTION = "X Resize and Rotate extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXrandr-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb deleted file mode 100644 index 3081f4ab86..0000000000 --- a/packages/xlibs/libxrandr_1.1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Resize and Rotate extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "randrproto libx11 libxrender libxext" - -XORG_PN = "libXrandr" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb deleted file mode 100644 index 0c7978945a..0000000000 --- a/packages/xlibs/libxrandr_1.1.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X Resize and Rotate extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "BSD-X" - -DEPENDS = "randrproto libx11 libxrender libxext" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXrandr" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxrandr_cvs.bb b/packages/xlibs/libxrandr_cvs.bb deleted file mode 100644 index 3b6fd02de8..0000000000 --- a/packages/xlibs/libxrandr_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "BSD-X" -SECTION = "x11/libs" -DEPENDS = "randrext libx11 libxrender libxext" -DESCRIPTION = "X Resize and Rotate extension library." -PR = "r1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr" -S = "${WORKDIR}/Xrandr" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxrender/.mtn2git_empty b/packages/xlibs/libxrender/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxrender/autofoo.patch b/packages/xlibs/libxrender/autofoo.patch deleted file mode 100644 index eb21c766f8..0000000000 --- a/packages/xlibs/libxrender/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libXrender-0.8.4/configure.ac~autofoo -+++ libXrender-0.8.4/configure.ac -@@ -33,11 +33,10 @@ - dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n - dnl - AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE -- - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxrender_0.8.4.bb b/packages/xlibs/libxrender_0.8.4.bb deleted file mode 100644 index b36c5701ba..0000000000 --- a/packages/xlibs/libxrender_0.8.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -DEPENDS = "renderext libx11" -DESCRIPTION = "X Render extension library." -LICENSE = "BSD" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXrender-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb deleted file mode 100644 index 1cff60983a..0000000000 --- a/packages/xlibs/libxrender_0.9.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Render extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "BSD" - -DEPENDS = "renderproto libx11" - -XORG_PN = "libXrender" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb deleted file mode 100644 index 1ee518645b..0000000000 --- a/packages/xlibs/libxrender_0.9.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X Render extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "BSD" - -DEPENDS = "renderproto libx11" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXrender" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxrender_cvs.bb b/packages/xlibs/libxrender_cvs.bb deleted file mode 100644 index ea6b1f4607..0000000000 --- a/packages/xlibs/libxrender_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -PR = "r1" -SECTION = "libs" -DEPENDS = "renderext libx11" -DESCRIPTION = "X Render extension library." -LICENSE = "BSD" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender" -S = "${WORKDIR}/Xrender" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxres_1.0.1.bb b/packages/xlibs/libxres_1.0.1.bb deleted file mode 100644 index c01731d37a..0000000000 --- a/packages/xlibs/libxres_1.0.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "x11/libs" -MAINTAINER = "Greg Gilbert " -DEPENDS = "libx11 xextensions libxext resourceext" -PROVIDES = "xres" -DESCRIPTION = "X Resource usage library." -LICENSE = "X-MIT" -SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2" -S = "${WORKDIR}/libXres-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb deleted file mode 100644 index a9806f57b1..0000000000 --- a/packages/xlibs/libxres_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "X Resource usage library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "X-MIT" - -DEPENDS = "libx11 xextproto libxext resourceproto" -PROVIDES = "xres" - -XORG_PN = "libXres" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb deleted file mode 100644 index e2ac5aee7b..0000000000 --- a/packages/xlibs/libxres_X11R7.1-1.0.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "X Resource usage library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "X-MIT" - -DEPENDS = "libx11 libxext" -PROVIDES = "xres" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXres" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxres_cvs.bb b/packages/xlibs/libxres_cvs.bb deleted file mode 100644 index e3e5c6704c..0000000000 --- a/packages/xlibs/libxres_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -MAINTAINER = "Greg Gilbert " -DEPENDS = "libx11 xextensions libxext resourceext" -PROVIDES = "xres" -DESCRIPTION = "X Resource usage library." -LICENSE = "X-MIT" -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes" -S = "${WORKDIR}/XRes" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb deleted file mode 100644 index 92dd4c82c4..0000000000 --- a/packages/xlibs/libxss_1.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "X screen saver extension library." -SECTION = "libs" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxext xextproto scrnsaverproto" -PROVIDES = "libxss" -RREPLACES = "libxss" - -XORG_PN = "libXScrnSaver" - -include xorg-xlibs.inc - -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxss_cvs.bb b/packages/xlibs/libxss_cvs.bb deleted file mode 100644 index af064f5b4d..0000000000 --- a/packages/xlibs/libxss_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -LICENSE = "GPL" - -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -SECTION = "libs" -DEPENDS = "libx11 libxext" -DESCRIPTION = "X screen saver extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" -S = "${WORKDIR}/Xss" - -inherit autotools pkgconfig - -#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxt/.mtn2git_empty b/packages/xlibs/libxt/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxt/autofoo.patch b/packages/xlibs/libxt/autofoo.patch deleted file mode 100644 index ff6dfdbbcc..0000000000 --- a/packages/xlibs/libxt/autofoo.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400 -+++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500 -@@ -28,11 +28,11 @@ - dnl - dnl - AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt) -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE([dist-bzip2]) - AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) --AC_CONFIG_AUX_DIR(.) - - # Check for progs - AC_PROG_CC diff --git a/packages/xlibs/libxt_0.1.5.bb b/packages/xlibs/libxt_0.1.5.bb deleted file mode 100644 index 00cbe9a3ad..0000000000 --- a/packages/xlibs/libxt_0.1.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "libx11 libsm" -PROVIDES = "xt" -DESCRIPTION = "X Toolkit Intrinsics" -LICENSE = "X-MIT" -PR = "r1" -SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXt-${PV}" - -PARALLEL_MAKE = "" - -inherit autotools pkgconfig - -#nasty hack as utils need to be native -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs - ) - oe_runmake -} - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb deleted file mode 100644 index 606de5f31c..0000000000 --- a/packages/xlibs/libxt_1.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "X Toolkit Intrinsics" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-MIT" - -DEPENDS = "libx11 libsm util-macros kbproto" -PROVIDES = "xt" - -XORG_PN = "libXt" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs - ) - oe_runmake -} diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb deleted file mode 100644 index 69c74343a4..0000000000 --- a/packages/xlibs/libxt_1.0.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "X Toolkit Intrinsics" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "X-MIT" - -DEPENDS = "libx11 libsm util-macros" -PROVIDES = "xt" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXt" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs - ) - oe_runmake -} diff --git a/packages/xlibs/libxt_cvs.bb b/packages/xlibs/libxt_cvs.bb deleted file mode 100644 index fdabe1d90f..0000000000 --- a/packages/xlibs/libxt_cvs.bb +++ /dev/null @@ -1,26 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "libx11 libsm" -PROVIDES = "xt" -DESCRIPTION = "X Toolkit Intrinsics" -LICENSE = "X-MIT" -PR = "r1" -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt" -S = "${WORKDIR}/Xt" - -inherit autotools pkgconfig - - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs - ) - oe_runmake -} - - -do_stage () { - autotools_stage_all -} diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb deleted file mode 100644 index 1355142ffd..0000000000 --- a/packages/xlibs/libxtst_1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Test Extension: client side library" -SECTION = "x11/libs" -PRIORITY = "optional" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxext recordproto xextproto inputproto" -PROVIDES = "xtst" - -XORG_PN = "libXtst" - -include xorg-xlibs.inc diff --git a/packages/xlibs/libxtst_cvs.bb b/packages/xlibs/libxtst_cvs.bb deleted file mode 100644 index c7c24d5d74..0000000000 --- a/packages/xlibs/libxtst_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "libx11 recordext libxext" -PROVIDES = "xtst" -DESCRIPTION = "X Test Extension: client side library" -PR = "r3" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst" -S = "${WORKDIR}/Xtst" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxv_2.2.2+cvs20040918.bb b/packages/xlibs/libxv_2.2.2+cvs20040918.bb deleted file mode 100644 index e70ce9cee9..0000000000 --- a/packages/xlibs/libxv_2.2.2+cvs20040918.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DEPENDS = "libx11 libxext" -DESCRIPTION = "X Video extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" -S = "${WORKDIR}/Xv" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxv_2.2.2.bb b/packages/xlibs/libxv_2.2.2.bb deleted file mode 100644 index 49e9670120..0000000000 --- a/packages/xlibs/libxv_2.2.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DEPENDS = "libx11 libxext" -DESCRIPTION = "X Video extension library." - -SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" -S = "${WORKDIR}/libXv-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb deleted file mode 100644 index 2d5c6aeb17..0000000000 --- a/packages/xlibs/libxv_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X Video extension library." -SECTION = "x11/libs" -#MAINTAINER = "" -LICENSE = "GPL" - -DEPENDS = "libx11 libxext xextproto videoproto" - -XORG_PN = "libXv" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xlibs/libxvmc/.mtn2git_empty b/packages/xlibs/libxvmc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/libxvmc/drm.patch b/packages/xlibs/libxvmc/drm.patch deleted file mode 100644 index d48cdb3d0b..0000000000 --- a/packages/xlibs/libxvmc/drm.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000 -+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000 -@@ -1,5 +1,5 @@ - AM_CFLAGS = $(XVMC_CFLAGS) --libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm -+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm - - lib_LTLIBRARIES = libviaXvMC.la - diff --git a/packages/xlibs/libxvmc/true.patch b/packages/xlibs/libxvmc/true.patch deleted file mode 100644 index 7059295007..0000000000 --- a/packages/xlibs/libxvmc/true.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100 -+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100 -@@ -43,6 +43,8 @@ - #include - #include - #include "vldXvMC.h" -+ -+#define TRUE 1 - - #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \ - (((CARD8 *)(ctx)->sAreaAddress) + \ diff --git a/packages/xlibs/libxvmc/via.patch b/packages/xlibs/libxvmc/via.patch deleted file mode 100644 index 21cdfbdd6b..0000000000 --- a/packages/xlibs/libxvmc/via.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100 -+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100 -@@ -14,4 +14,5 @@ - AC_OUTPUT([Makefile - hw/Makefile - hw/i810/Makefile -+ hw/via/Makefile - xvmc.pc]) ---- /dev/null 2004-06-13 02:32:19.000000000 +0100 -+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100 -@@ -0,0 +1,7 @@ -+AM_CFLAGS = $(XVMC_CFLAGS) -+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm -+ -+lib_LTLIBRARIES = libviaXvMC.la -+ -+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \ -+ viaXvMCPriv.h ---- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100 -+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100 -@@ -1 +1 @@ --SUBDIRS = i810 -+SUBDIRS = i810 via diff --git a/packages/xlibs/libxvmc_20040919.bb b/packages/xlibs/libxvmc_20040919.bb deleted file mode 100644 index b70c9f52e4..0000000000 --- a/packages/xlibs/libxvmc_20040919.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "X Video Motion Compensation extension library." -SECTION = "x11/libs" -DEPENDS = "libx11 libxext libxv drm xserver-xorg" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \ - file://via.patch;patch=1 \ - file://true.patch" -S = "${WORKDIR}/XvMC" - -CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg" - -# this one is for via only atm. -COMPATIBLE_HOST = 'i.86.*-linux' - -inherit autotools pkgconfig - -do_configure_prepend() { - install -d ${S}/hw/via - cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/ - ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch ) -} - -do_compile() { - oe_runmake - oe_runmake -C hw/via -} - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man - oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} - install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ -} diff --git a/packages/xlibs/libxvmc_20041025.bb b/packages/xlibs/libxvmc_20041025.bb deleted file mode 100644 index 829a74d92b..0000000000 --- a/packages/xlibs/libxvmc_20041025.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "X Video Motion Compensation extension library." -SECTION = "x11/libs" -DEPENDS = "libx11 libxext libxv drm xserver-xorg" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ - file://true.patch;patch=1 file://drm.patch;patch=1" -S = "${WORKDIR}/XvMC" - -CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" - -# this one is for via only atm. -COMPATIBLE_HOST = 'i.86.*-linux' - -inherit autotools pkgconfig - -do_compile() { - oe_runmake - oe_runmake -C hw/via -} - -do_install() { - oe_runmake DESTDIR='${D}' install - oe_runmake -C hw/via DESTDIR='${D}' install -} - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man - oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} - install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ -} diff --git a/packages/xlibs/libxvmc_20050612.bb b/packages/xlibs/libxvmc_20050612.bb deleted file mode 100644 index 18cd369acc..0000000000 --- a/packages/xlibs/libxvmc_20050612.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "X Video Motion Compensation extension library." -SECTION = "x11/libs" -DEPENDS = "libx11 libxext libxv drm xserver-xorg" -PR = "r0" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ - ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \ - file://true.patch;patch=1 file://drm.patch;patch=1" -S = "${WORKDIR}/XvMC" - -CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" - -# this one is for via only atm. -COMPATIBLE_HOST = 'i.86.*-linux' - -inherit autotools pkgconfig - -do_compile() { - oe_runmake - oe_runmake -C hw/via -} - -do_install() { - oe_runmake DESTDIR='${D}' install - oe_runmake -C hw/via DESTDIR='${D}' install -} - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man - oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} - install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ -} diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb deleted file mode 100644 index 82e784789f..0000000000 --- a/packages/xlibs/libxxf86dga_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Xxf86dga extension library." -SECTION = "x11/libs" -LICENSE = "XFree86" - -DEPENDS = "libx11 libxext xf86dgaproto" - -XORG_PN = "libXxf86dga" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_stage() { - oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb deleted file mode 100644 index 2842c2c458..0000000000 --- a/packages/xlibs/libxxf86dga_1.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Xxf86dga extension library." -SECTION = "x11/libs" -LICENSE = "XFree86" - -DEPENDS = "libx11 libxext" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXxf86dga" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_stage() { - oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libxxf86dga_cvs.bb b/packages/xlibs/libxxf86dga_cvs.bb deleted file mode 100644 index 96acce5d0e..0000000000 --- a/packages/xlibs/libxxf86dga_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "XFree86" - -SECTION = "x11/libs" -DEPENDS = "libx11 libxext xxf86dgaext" -DESCRIPTION = "Xxf86dga extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" -S = "${WORKDIR}/Xxf86dga" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} -} diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xlibs/libxxf86misc_1.0.0.bb deleted file mode 100644 index 5d5badb7a1..0000000000 --- a/packages/xlibs/libxxf86misc_1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext xf86miscproto" - -XORG_PN = "libXxf86misc" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb deleted file mode 100644 index 2544f91ab1..0000000000 --- a/packages/xlibs/libxxf86misc_1.0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" -DEPENDS = "libx11 libxext" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXxf86misc" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb deleted file mode 100644 index 47a319c28e..0000000000 --- a/packages/xlibs/libxxf86vm_1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" - -DEPENDS = "libx11 libxext xf86vidmodeproto" - -XORG_PN = "libXxf86vm" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb deleted file mode 100644 index 0ab206a0df..0000000000 --- a/packages/xlibs/libxxf86vm_1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Xxf86vm extension library." -SECTION = "x11/libs" -LICENSE = "MIT" - -DEPENDS = "libx11 libxext" - -XORG_RELEASE = "X11R7.1" -XORG_PN = "libXxf86vm" - -include xorg-xlibs.inc - -EXTRA_OECONF="--enable-malloc0returnsnull" - diff --git a/packages/xlibs/libxxf86vm_cvs.bb b/packages/xlibs/libxxf86vm_cvs.bb deleted file mode 100644 index 5eb48f930d..0000000000 --- a/packages/xlibs/libxxf86vm_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" - -SECTION = "x11/libs" -DEPENDS = "libx11 libxext xxf86vmext" -DESCRIPTION = "Xxf86vm extension library." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" -S = "${WORKDIR}/Xxf86vm" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb deleted file mode 100644 index 6b009a7ea7..0000000000 --- a/packages/xlibs/util-macros_1.0.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" -#MAINTAINER = "" - -XORG_PN = "${PN}" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2" diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb deleted file mode 100644 index 76101b0345..0000000000 --- a/packages/xlibs/util-macros_1.0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" -#MAINTAINER = "" - -XORG_PN = "${PN}" -XORG_RELEASE = "X11R7.1" - -include xorg-xlibs.inc - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2" diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc deleted file mode 100644 index 8fb46777b0..0000000000 --- a/packages/xlibs/xorg-xlibs.inc +++ /dev/null @@ -1,12 +0,0 @@ -XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}" -XORG_RELEASE ?= "X11R7.0" - -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" - - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/xtrans-native_0.1.bb b/packages/xlibs/xtrans-native_0.1.bb deleted file mode 100644 index 80de95c869..0000000000 --- a/packages/xlibs/xtrans-native_0.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -SECTION = "x11/base" -include xtrans_${PV}.bb -inherit native diff --git a/packages/xlibs/xtrans_0.1.bb b/packages/xlibs/xtrans_0.1.bb deleted file mode 100644 index 8fee0d5089..0000000000 --- a/packages/xlibs/xtrans_0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT" -MAINTAINER = "Greg Gilbert " -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - -SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2" -S = "${WORKDIR}/libXtrans-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb deleted file mode 100644 index b6933bf615..0000000000 --- a/packages/xlibs/xtrans_1.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "MIT" -SECTION = "x11/libs" -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - -XORG_PN = "${PN}" - -include xorg-xlibs.inc diff --git a/packages/xlibs/xtrans_cvs.bb b/packages/xlibs/xtrans_cvs.bb deleted file mode 100644 index 9714f4017b..0000000000 --- a/packages/xlibs/xtrans_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -SECTION = "x11/libs" -MAINTAINER = "Greg Gilbert " -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans" -S = "${WORKDIR}/xtrans" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xmodmap/xmodmap/.mtn2git_empty b/packages/xmodmap/xmodmap/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xmodmap/xmodmap/autofoo.patch b/packages/xmodmap/xmodmap/autofoo.patch deleted file mode 100644 index f309add086..0000000000 --- a/packages/xmodmap/xmodmap/autofoo.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am ---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XMODMAP_CFLAGS@ -+ -+bin_PROGRAMS = xmodmap -+ -+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h -+ -+xmodmap_LDADD = @XMODMAP_LIBS@ -+ -+man5_MANS=xmodmap.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh ---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200 -@@ -0,0 +1,3 @@ -+#! /bin/sh -+autoreconf -v --install || exit 1 -+./configure --enable-maintainer-mode "$@" -diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac ---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200 -@@ -0,0 +1,41 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xmodmap],4.4.0,[],xmodmap) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XMODMAP, x11) -+ -+AC_OUTPUT([Makefile]) diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb deleted file mode 100644 index d65c84bb71..0000000000 --- a/packages/xmodmap/xmodmap_1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "MIT" -DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" - -DEPENDS = "libx11" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools pkgconfig diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb deleted file mode 100644 index 773466e6bb..0000000000 --- a/packages/xmodmap/xmodmap_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -PR = "r1" - -DEPENDS = "libx11" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xmodmap" - -inherit autotools pkgconfig diff --git a/packages/xorg-app/.mtn2git_empty b/packages/xorg-app/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..96492be848 --- /dev/null +++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libxfont" diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..19b59b8381 --- /dev/null +++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libice" diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..eff2e125e7 --- /dev/null +++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "mkfontscale" diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..ead4663781 --- /dev/null +++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libfontenc freetype" diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..714ab3f83f --- /dev/null +++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libxt" diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..e02bc4cf7b --- /dev/null +++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb @@ -0,0 +1,14 @@ +PR = "r1" + +include app-common.inc +DEPENDS = "libx11 libxt libxmu" + +inherit update-alternatives + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" + + + diff --git a/packages/xorg-app/xauth/.mtn2git_empty b/packages/xorg-app/xauth/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xauth/autofoo.patch b/packages/xorg-app/xauth/autofoo.patch new file mode 100644 index 0000000000..d279a6f4fc --- /dev/null +++ b/packages/xorg-app/xauth/autofoo.patch @@ -0,0 +1,148 @@ +diff -urN xauth.orig/Imakefile xauth/Imakefile +--- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200 ++++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ +- +- +- +- +-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $ +- +- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB) +- SRCS = xauth.c gethost.c process.c parsedpy.c +- OBJS = xauth.o gethost.o process.o parsedpy.o +- CONN_DEFINES = $(CONNECTION_FLAGS) +- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES) +- +-ComplexProgramTarget(xauth) +- +-SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) +-SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES)) +-SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES)) +diff -urN xauth.orig/Makefile.am xauth/Makefile.am +--- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XAUTH_CFLAGS@ ++ ++bin_PROGRAMS = xauth ++ ++xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h ++ ++xauth_LDADD = @XAUTH_LIBS@ ++ ++man5_MANS=xauth.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xauth.orig/autogen.sh xauth/autogen.sh +--- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200 +@@ -0,0 +1,3 @@ ++#! /bin/sh ++autoreconf -v --install || exit 1 ++./configure --enable-maintainer-mode "$@" +diff -urN xauth.orig/configure.ac xauth/configure.ac +--- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200 +@@ -0,0 +1,57 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xauth],4.4.0,[],xauth) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11) ++ ++AC_TYPE_SIGNAL ++ ++# Transport selection ++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) ++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) ++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) ++if test "$UNIXCONN" = "yes"; then ++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) ++fi ++if test "$TCPCONN" = "yes"; then ++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) ++fi ++if test "$IPV6CONN" = "yes"; then ++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) ++fi ++ ++AC_OUTPUT([Makefile]) diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..c9d1a12ba2 --- /dev/null +++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libxau libxext libxmu" diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb new file mode 100644 index 0000000000..54700574b7 --- /dev/null +++ b/packages/xorg-app/xauth_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +DEPENDS = "libx11 libxau libxmu libxext" +DESCRIPTION = "X authority file utility" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xauth" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..8a4b59d811 --- /dev/null +++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libxrender libxft libxkbfile libxaw" diff --git a/packages/xorg-app/xdpyinfo/.mtn2git_empty b/packages/xorg-app/xdpyinfo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xdpyinfo/disable-xkb.patch b/packages/xorg-app/xdpyinfo/disable-xkb.patch new file mode 100644 index 0000000000..24af21f4fc --- /dev/null +++ b/packages/xorg-app/xdpyinfo/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 ++++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 +@@ -45,11 +45,15 @@ + AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(DPY_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..a8972e18ab --- /dev/null +++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +LICENSE = "MIT" +DEPENDS = "libx11 libxext libxtst" +DESCRIPTION = "X display information utility" +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \ + file://disable-xkb.patch;patch=1" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +EXTRA_OECONF = "--disable-xkb" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb new file mode 100644 index 0000000000..eb63ae7f4d --- /dev/null +++ b/packages/xorg-app/xdpyinfo_cvs.bb @@ -0,0 +1,12 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +DEPENDS = "libx11 libxext libxtst" +DESCRIPTION = "X display information utility" +MAINTAINER = "Phil Blundell " +SECTION = "x11/base" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo" +S = "${WORKDIR}/xdpyinfo" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xev/.mtn2git_empty b/packages/xorg-app/xev/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xev/diet-x11.patch b/packages/xorg-app/xev/diet-x11.patch new file mode 100644 index 0000000000..7e93f160a5 --- /dev/null +++ b/packages/xorg-app/xev/diet-x11.patch @@ -0,0 +1,74 @@ +--- xev/xev.c 2004-02-06 11:00:37.000000000 -0800 ++++ xev/xev.new.c 2005-08-04 15:40:36.000000000 -0700 +@@ -149,7 +149,7 @@ + nbytes = XLookupString (e, str, 256, &ks, NULL); + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + do { + nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); + buf[nmbbytes] = '\0'; +@@ -159,7 +159,7 @@ + buf = realloc (buf, bsize); + } + } while (status == XBufferOverflow); +- } ++ }*/ + + if (ks == NoSymbol) + ksname = "NoSymbol"; +@@ -189,7 +189,7 @@ + } + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + printf (" XmbLookupString gives %d bytes: ", nmbbytes); + if (nmbbytes > 0) { + dump (buf, nmbbytes); +@@ -200,7 +200,7 @@ + + printf (" XFilterEvent returns: %s\n", + XFilterEvent (eventp, e->window) ? "True" : "False"); +- } ++ }*/ + } + + static void +@@ -857,7 +857,7 @@ + fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + } + +- xim = XOpenIM (dpy, NULL, NULL, NULL); ++ /*xim = XOpenIM (dpy, NULL, NULL, NULL); + if (xim == NULL) { + fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); + } +@@ -884,7 +884,7 @@ + } + XFree (xim_styles); + } +- } ++ }*/ + + screen = DefaultScreen (dpy); + +@@ -948,7 +948,7 @@ + printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + } + +- if (xim && xim_style) { ++ /*if (xim && xim_style) { + xic = XCreateIC (xim, + XNInputStyle, xim_style, + XNClientWindow, w, +@@ -958,7 +958,7 @@ + if (xic == NULL) { + fprintf (stderr, "XCreateIC failed\n"); + } +- } ++ }*/ + + for (done = 0; !done; ) { + XEvent event; diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..2d0f79b046 --- /dev/null +++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Event Viewer" +HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" +LICENSE = "MIT" +MAINTAINER = "Justin Patrin " +SECTION = "x11/base" +DEPENDS = "libx11 libxau" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \ + file://diet-x11.patch;patch=1" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb new file mode 100644 index 0000000000..3ea9d05c63 --- /dev/null +++ b/packages/xorg-app/xev_cvs.bb @@ -0,0 +1,21 @@ +PV = "0.0+cvs${SRCDATE}" +DESCRIPTION = "X Event Viewer" +HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps" +LICENSE = "MIT" +MAINTAINER = "Justin Patrin " +SECTION = "x11/base" +DEPENDS = "libx11 libxau" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \ + file://diet-x11.patch;patch=1" +S = "${WORKDIR}/xev" + +do_compile() { + ${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${PN} ${D}${bindir} +} diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..c9d1a12ba2 --- /dev/null +++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libxau libxext libxmu" diff --git a/packages/xorg-app/xhost/.mtn2git_empty b/packages/xorg-app/xhost/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xhost/autofoo.patch b/packages/xorg-app/xhost/autofoo.patch new file mode 100644 index 0000000000..b29f017abc --- /dev/null +++ b/packages/xorg-app/xhost/autofoo.patch @@ -0,0 +1,165 @@ +diff -urN xhost.orig/Imakefile xhost/Imakefile +--- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100 ++++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,16 +0,0 @@ +-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ +-#if HasSecureRPC +-RPC_DEFINES = -DSECURE_RPC +-#else +-RPC_DEFINES = +-#endif +-KRB5_DEFINES = Krb5Defines +-KRB5_INCLUDE = Krb5Includes +- INCLUDES = $(KRB5_INCLUDE) +- DEPLIBS = $(DEPXMULIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(XMULIB) $(XLIB) +- SRCS = xhost.c +- OBJS = xhost.o +- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) +- +-ComplexProgramTarget(xhost) +diff -urN xhost.orig/Makefile.am xhost/Makefile.am +--- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XHOST_CFLAGS@ ++ ++bin_PROGRAMS = xhost ++ ++xhost_SOURCES = xhost.c ++ ++xhost_LDADD = @XHOST_LIBS@ ++ ++man5_MANS=xhost.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xhost.orig/configure.ac xhost/configure.ac +--- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200 +@@ -0,0 +1,57 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xhost],4.4.0,[],xhost) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XHOST, xext xmuu x11) ++ ++AC_TYPE_SIGNAL ++ ++# Transport selection ++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) ++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) ++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) ++if test "$UNIXCONN" = "yes"; then ++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) ++fi ++if test "$TCPCONN" = "yes"; then ++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) ++fi ++if test "$IPV6CONN" = "yes"; then ++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) ++fi ++ ++AC_OUTPUT([Makefile]) +diff -urN xhost.orig/xhost.c xhost/xhost.c +--- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100 ++++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200 +@@ -27,6 +27,10 @@ + + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #if defined(TCPCONN) || defined(STREAMSCONN) + #define NEEDSOCKETS + #endif +@@ -102,11 +106,7 @@ + static int local_xerror(); + static char *get_hostname(); + +-#ifdef SIGNALRETURNSINT +-#define signal_t int +-#else +-#define signal_t void +-#endif ++#define signal_t RETSIGTYPE + static signal_t nameserver_lost(); + + #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */ diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb new file mode 100644 index 0000000000..4d36e62bee --- /dev/null +++ b/packages/xorg-app/xhost_20040413.bb @@ -0,0 +1,14 @@ +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +LICENSE = "MIT" +PV = "0.0+cvs${FIXEDSRCDATE}" +DEPENDS = "libx11 libxext libxmu" +DESCRIPTION = "server access control program for X" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xhost" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..220de1b535 --- /dev/null +++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb @@ -0,0 +1,10 @@ +LICENSE = "MIT" +DEPENDS = "libx11 libxext libxmu" +DESCRIPTION = "server access control program for X" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..2e65b76202 --- /dev/null +++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 twm xclock xeyes xrdb" diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..808f5d0a6d --- /dev/null +++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb @@ -0,0 +1,2 @@ +include app-common.inc +DEPENDS = "libx11 libxkbfile" diff --git a/packages/xorg-app/xmodmap/.mtn2git_empty b/packages/xorg-app/xmodmap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xmodmap/autofoo.patch b/packages/xorg-app/xmodmap/autofoo.patch new file mode 100644 index 0000000000..f309add086 --- /dev/null +++ b/packages/xorg-app/xmodmap/autofoo.patch @@ -0,0 +1,109 @@ +diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am +--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XMODMAP_CFLAGS@ ++ ++bin_PROGRAMS = xmodmap ++ ++xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h ++ ++xmodmap_LDADD = @XMODMAP_LIBS@ ++ ++man5_MANS=xmodmap.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh +--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200 +@@ -0,0 +1,3 @@ ++#! /bin/sh ++autoreconf -v --install || exit 1 ++./configure --enable-maintainer-mode "$@" +diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac +--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200 +@@ -0,0 +1,41 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xmodmap],4.4.0,[],xmodmap) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XMODMAP, x11) ++ ++AC_OUTPUT([Makefile]) diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..d65c84bb71 --- /dev/null +++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +LICENSE = "MIT" +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" + +DEPENDS = "libx11" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb new file mode 100644 index 0000000000..773466e6bb --- /dev/null +++ b/packages/xorg-app/xmodmap_cvs.bb @@ -0,0 +1,14 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" +PR = "r1" + +DEPENDS = "libx11" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xmodmap" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc new file mode 100644 index 0000000000..9d668cd9b2 --- /dev/null +++ b/packages/xorg-app/xorg-app-common.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "X application" +SECTION = "x11/apps" +LICENSE= "MIT-X" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2" + +S = ${WORKDIR}/${PN}-X11R7.0-${PV} + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-app/xprop/.mtn2git_empty b/packages/xorg-app/xprop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xprop/autofoo.patch b/packages/xorg-app/xprop/autofoo.patch new file mode 100644 index 0000000000..2526d95087 --- /dev/null +++ b/packages/xorg-app/xprop/autofoo.patch @@ -0,0 +1,157 @@ +diff -urN xprop.orig/Makefile.am xprop/Makefile.am +--- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XPROP_CFLAGS@ ++ ++bin_PROGRAMS = xprop ++ ++xprop_SOURCES = dsimple.c dsimple.h xprop.c ++ ++xprop_LDADD = @XPROP_LIBS@ ++ ++man5_MANS=xprop.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xprop.orig/configure.ac xprop/configure.ac +--- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200 +@@ -0,0 +1,44 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xprop],4.4.0,[],xprop) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XPROP, xext xmuu x11) ++ ++AC_CHECK_HEADERS([wchar.h]) ++AC_CHECK_HEADERS([wctype.h]) ++ ++AC_OUTPUT([Makefile]) +diff -urN xprop.orig/dsimple.c xprop/dsimple.c +--- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100 ++++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200 +@@ -27,11 +27,16 @@ + + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include + #include + #include ++#include + /* + * Other_stuff.h: Definitions of routines in other_stuff. + * +@@ -69,7 +74,7 @@ + char *Malloc(size) + unsigned size; + { +- char *data, *malloc(); ++ char *data; + + if (!(data = malloc(size))) + Fatal_Error("Out of memory!"); +@@ -85,7 +90,7 @@ + char *ptr; + int size; + { +- char *new_ptr, *realloc(); ++ char *new_ptr; + + if (!ptr) + return(Malloc(size)); +diff -urN xprop.orig/xprop.c xprop/xprop.c +--- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200 ++++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200 +@@ -30,6 +30,10 @@ + /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb new file mode 100644 index 0000000000..f6dd54b7cd --- /dev/null +++ b/packages/xorg-app/xprop_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +DEPENDS = "libx11 libxmu libxext" +DESCRIPTION = "property displayer for X" +MAINTER = "Rene Wagner " +SECTION = "x11/base" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xprop" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..db750c8b97 --- /dev/null +++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb @@ -0,0 +1,9 @@ +LICENSE= "BSD-X" +DEPENDS = "libxrandr libx11 libxext" +DESCRIPTION = "X Resize and Rotate extension command." +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb new file mode 100644 index 0000000000..0ab7c745f4 --- /dev/null +++ b/packages/xorg-app/xrandr_cvs.bb @@ -0,0 +1,10 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +DEPENDS = "libxrandr libx11 libxext" +DESCRIPTION = "X Resize and Rotate extension command." +SECTION = "x11/base" + +SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr" +S = "${WORKDIR}/xrandr" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xrdb/.mtn2git_empty b/packages/xorg-app/xrdb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xrdb/autofoo.patch b/packages/xorg-app/xrdb/autofoo.patch new file mode 100644 index 0000000000..b30a46bc36 --- /dev/null +++ b/packages/xorg-app/xrdb/autofoo.patch @@ -0,0 +1,132 @@ +diff -urN xrdb.orig/Imakefile xrdb/Imakefile +--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200 ++++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ +- +- +- +- +-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $ +- +-#ifdef PatheticCpp +- CPPDEFS = -DPATHETICCPP +-#endif +-#if HasMkstemp +- CPPDEFS = -DHAS_MKSTEMP +-#endif +-XCOMM Due to ill make parsing the cpp is passed directly in source file +- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS) +- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) +-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) +- +-SimpleProgramTarget(xrdb) +diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am +--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XRDB_CFLAGS@ ++ ++bin_PROGRAMS = xrdb ++ ++xrdb_SOURCES = xrdb.c ++ ++xrdb_LDADD = @XRDB_LIBS@ ++ ++man5_MANS=xrdb.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh +--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200 +@@ -0,0 +1,3 @@ ++#! /bin/sh ++autoreconf -v --install || exit 1 ++./configure --enable-maintainer-mode "$@" +diff -urN xrdb.orig/configure.ac xrdb/configure.ac +--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200 +@@ -0,0 +1,41 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xrdb],4.4.0,[],xrdb) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XRDB, xext xmuu x11) ++ ++AC_OUTPUT([Makefile]) diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..5703556a33 --- /dev/null +++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb @@ -0,0 +1,11 @@ +DEPENDS = "libx11 libxmu libxext" +DESCRIPTION = "X server resource database utility" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" +LICENSE = "xrdb" +PR = "r0" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb new file mode 100644 index 0000000000..cbf2caac70 --- /dev/null +++ b/packages/xorg-app/xrdb_cvs.bb @@ -0,0 +1,13 @@ +PV = "0.0+cvs${SRCDATE}" +DEPENDS = "libx11 libxmu libxext" +DESCRIPTION = "X server resource database utility" +MAINTAINER = "Rene Wagner " +SECTION = "x11/base" +LICENSE = "xrdb" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xrdb" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xset/.mtn2git_empty b/packages/xorg-app/xset/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-app/xset/autofoo.patch b/packages/xorg-app/xset/autofoo.patch new file mode 100644 index 0000000000..039d1319e3 --- /dev/null +++ b/packages/xorg-app/xset/autofoo.patch @@ -0,0 +1,109 @@ +diff -urN xset.orig/Makefile.am xset/Makefile.am +--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200 +@@ -0,0 +1,53 @@ ++# ++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ ++# ++# Copyright © 2003 Keith Packard ++# ++# Permission to use, copy, modify, distribute, and sell this software and its ++# documentation for any purpose is hereby granted without fee, provided that ++# the above copyright notice appear in all copies and that both that ++# copyright notice and this permission notice appear in supporting ++# documentation, and that the name of Keith Packard not be used in ++# advertising or publicity pertaining to distribution of the software without ++# specific, written prior permission. Keith Packard makes no ++# representations about the suitability of this software for any purpose. It ++# is provided "as is" without express or implied warranty. ++# ++# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++# ++ ++AUTOMAKE_OPTIONS = 1.7 foreign ++ ++AM_CFLAGS = @XSET_CFLAGS@ ++ ++bin_PROGRAMS = xset ++ ++xset_SOURCES = xset.c ++ ++xset_LDADD = @XSET_LIBS@ ++ ++man5_MANS=xset.man ++ ++EXTRA_DIST= $(man5_MANS) ++ ++MAINTAINERCLEANFILES = configure \ ++config.guess \ ++config.sub \ ++install-sh \ ++ltmain.sh \ ++missing \ ++mkinstalldirs \ ++aclocal.m4 \ ++Makefile.in \ ++depcomp \ ++autoscan.log \ ++configure.scan \ ++config.h \ ++config.h.in \ ++$(man5_MANS) +diff -urN xset.orig/autogen.sh xset/autogen.sh +--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200 +@@ -0,0 +1,3 @@ ++#! /bin/sh ++autoreconf -v --install || exit 1 ++./configure --enable-maintainer-mode "$@" +diff -urN xset.orig/configure.ac xset/configure.ac +--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200 +@@ -0,0 +1,41 @@ ++dnl ++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ ++dnl ++dnl Copyright © 2003 Keith Packard ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_PREREQ(2.57) ++AC_INIT([xset],4.4.0,[],xset) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE ++AM_CONFIG_HEADER(config.h) ++ ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_LIBTOOL_WIN32_DLL ++AM_PROG_LIBTOOL ++AC_PROG_MAKE_SET ++ ++PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11) ++ ++AC_OUTPUT([Makefile]) diff --git a/packages/xorg-app/xset/disable-xkb.patch b/packages/xorg-app/xset/disable-xkb.patch new file mode 100644 index 0000000000..6060fbb995 --- /dev/null +++ b/packages/xorg-app/xset/disable-xkb.patch @@ -0,0 +1,18 @@ +--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 ++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 +@@ -42,11 +42,15 @@ + AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + ++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), ++ XKB="$enableval", XKB="yes") ++if test "x$XKB" = "xyes" ; then + PKG_CHECK_MODULES(SET_XKB, x11, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" + AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) ++fi + + PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, + [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb new file mode 100644 index 0000000000..daf57d15c8 --- /dev/null +++ b/packages/xorg-app/xset_20040817.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +MAINTAINER = "Florian Boor " +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +PV = "0.0+cvs${FIXEDSRCDATE}" +PR = "r1" + +DEPENDS = "libx11 libxext xextensions libxmu" + +CFLAGS += "-D_GNU_SOURCE" + +SECTION = "x11/base" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/xset" + +inherit autotools pkgconfig diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..55f3a0de21 --- /dev/null +++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +MAINTAINER = "Florian Boor " + +DEPENDS = "libx11 libxext xextproto libxmu" + +CFLAGS += "-D_GNU_SOURCE" + +SECTION = "x11/base" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \ + file://disable-xkb.patch;patch=1" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +EXTRA_OECONF = "--disable-xkb" + +inherit autotools pkgconfig diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/data-common.inc deleted file mode 100644 index 47dc922500..0000000000 --- a/packages/xorg-data/data-common.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "X data files" -SECTION = "x11/data" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb deleted file mode 100644 index aa6c16c802..0000000000 --- a/packages/xorg-data/xbitmaps_1.0.1.bb +++ /dev/null @@ -1 +0,0 @@ -include data-common.inc diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..aa6c16c802 --- /dev/null +++ b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb @@ -0,0 +1 @@ +include data-common.inc diff --git a/packages/xorg-data/xkbdata_1.0.1.bb b/packages/xorg-data/xkbdata_1.0.1.bb deleted file mode 100644 index 9b34b04ad2..0000000000 --- a/packages/xorg-data/xkbdata_1.0.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -include data-common.inc -FILES_${PN} = "/usr/share/X11/*" -RDEPENDS = "xkbcomp" diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..9b34b04ad2 --- /dev/null +++ b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb @@ -0,0 +1,3 @@ +include data-common.inc +FILES_${PN} = "/usr/share/X11/*" +RDEPENDS = "xkbcomp" diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc new file mode 100644 index 0000000000..47dc922500 --- /dev/null +++ b/packages/xorg-data/xorg-data-common.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "X data files" +SECTION = "x11/data" +LICENSE= "MIT-X" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-font/.mtn2git_empty b/packages/xorg-font/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-font/files/.mtn2git_empty b/packages/xorg-font/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-font/files/imake-staging.patch b/packages/xorg-font/files/imake-staging.patch new file mode 100644 index 0000000000..bf2e350830 --- /dev/null +++ b/packages/xorg-font/files/imake-staging.patch @@ -0,0 +1,38 @@ +--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 +@@ -2038,11 +2038,11 @@ + */ + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = LdPreLib $(INSTALLED_LIBS) + LDPOSTLIB = LdPostLib +- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) ++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) +--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 ++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 +@@ -114,7 +114,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif +--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 +@@ -3359,7 +3359,7 @@ + FREETYPE2LIBDIR = Freetype2LibDir + FREETYPE2INCDIR = Freetype2IncDir + #if Freetype2LibDirStandard +-FREETYPE2LIB = -lfreetype ++FREETYPE2LIB = $(LD_STAGING) -lfreetype + #else + FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype + #endif diff --git a/packages/xorg-font/files/lexer.patch b/packages/xorg-font/files/lexer.patch new file mode 100644 index 0000000000..c3caf57174 --- /dev/null +++ b/packages/xorg-font/files/lexer.patch @@ -0,0 +1,48 @@ +diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l +--- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000 ++++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000 +@@ -41,6 +41,7 @@ + #include + #include + #include ++int yy_prev_more_offset; + + #include "pswpriv.h" + #include "pswparser.h" +diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l +--- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000 ++++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000 +@@ -65,6 +41,7 @@ + #include "gram.h" + #include "list.h" + #include "parse.h" ++int yy_prev_more_offset; + + #ifdef FLEX_SCANNER + int yylineno; +diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l +--- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000 ++++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000 +@@ -11,6 +11,9 @@ + #include + #include "gram.h" + #include "constants.h" ++ ++int yy_prev_more_offset; ++ + #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) + int yylineno = 0; + #endif +diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l +--- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000 ++++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000 +@@ -37,6 +37,9 @@ + #include "parser.h" + #include + #include ++ ++int yy_prev_more_offset; ++ + static int getdimension(int token, const char *text, int leng); + static int getstring(int token, const char *text, int leng); + static int gettoken(int token, const char *text, int leng); diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..f757dd39bf --- /dev/null +++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb @@ -0,0 +1,4 @@ +include font-common.inc + +DEPENDS = "mkfontscale" +FILES_${PN} = "${libdir}/X11/fonts/*" diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..a7b1ceaf0d --- /dev/null +++ b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb @@ -0,0 +1,4 @@ +include font-common.inc + +DEPENDS = "bdftopcf font-util" +FILES_${PN} = "${libdir}/X11/fonts/*" diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..14022adaf9 --- /dev/null +++ b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb @@ -0,0 +1,7 @@ +include font-common.inc + +DEPENDS = "bdftopcf font-util" + +FILES_${PN} = "${libdir}/X11/fonts/misc/*" + +EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r" diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..5bbf7e0809 --- /dev/null +++ b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb @@ -0,0 +1,5 @@ +include font-common.inc + +DEPENDS = "bdftopcf" + +FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*" diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb new file mode 100644 index 0000000000..f6710dcd5b --- /dev/null +++ b/packages/xorg-font/xfonts-xorg_6.8.bb @@ -0,0 +1,57 @@ +SECTION = "x11/base" +PR = "r1" +# XXX Is this true? These fonts are from X.org. +LICENSE = "XFree86" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \ + file://lexer.patch;patch=1" + + +PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}" +FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi" +FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi" +FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1" +FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF" +FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic" +FILES_${PN} = "${libdir}/X11/fonts" + +PACKAGE_ARCH = "all" + +S = "${WORKDIR}/xc" + +do_configure() { + echo "#define ProjectRoot /usr" >> config/cf/host.def + echo "#define XnestServer NO" >> config/cf/host.def + echo "#define XdmxServer NO" >> config/cf/host.def + echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def + echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def + echo "#define BuildFreetype2Library YES" >> config/cf/host.def + echo "#define HasFreetype2 NO" >> config/cf/host.def + echo "" > config/cf/date.def + make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake + make CC="${BUILD_CC}" xmakefile + make Makefiles + make clean +} + +do_compile() { + #make depend + make includes + make -C config/util + make -C lib/freetype2 + make -C lib/font + make -C lib/fontenc + make -C lib/fontconfig + make -C programs/mkfontscale + make -C programs/bdftopcf + make -C programs/fc-cache + make -C fonts +} + +do_install() { + make -C fonts DESTDIR="${D}" install +} + +do_stage() { + : +} diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc new file mode 100644 index 0000000000..37d478bdc6 --- /dev/null +++ b/packages/xorg-font/xorg-font-common.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "X font files" +SECTION = "x11/fonts" +LICENSE= "MIT-X" + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2" +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" +FONT_DIR = "${datadir}/share/fonts" +DEPENDS = "encodings mkfontscale mkfontdir" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + + +FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz" + +pkg_postinst_${PN} () { + + if [ "x$D" != "x" ]; then + exit 1 + fi + + for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do + if test -d $fontdir ; then + mkfontdir $fontdir + mkfontscale $fontdir + fi + done +} diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-fonts/font-alias_1.0.1.bb deleted file mode 100644 index f757dd39bf..0000000000 --- a/packages/xorg-fonts/font-alias_1.0.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include font-common.inc - -DEPENDS = "mkfontscale" -FILES_${PN} = "${libdir}/X11/fonts/*" diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc deleted file mode 100644 index 37d478bdc6..0000000000 --- a/packages/xorg-fonts/font-common.inc +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "X font files" -SECTION = "x11/fonts" -LICENSE= "MIT-X" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" -FONT_DIR = "${datadir}/share/fonts" -DEPENDS = "encodings mkfontscale mkfontdir" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - - -FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz" - -pkg_postinst_${PN} () { - - if [ "x$D" != "x" ]; then - exit 1 - fi - - for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do - if test -d $fontdir ; then - mkfontdir $fontdir - mkfontscale $fontdir - fi - done -} diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb deleted file mode 100644 index a7b1ceaf0d..0000000000 --- a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -include font-common.inc - -DEPENDS = "bdftopcf font-util" -FILES_${PN} = "${libdir}/X11/fonts/*" diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-fonts/font-misc-misc_1.0.0.bb deleted file mode 100644 index 14022adaf9..0000000000 --- a/packages/xorg-fonts/font-misc-misc_1.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -include font-common.inc - -DEPENDS = "bdftopcf font-util" - -FILES_${PN} = "${libdir}/X11/fonts/misc/*" - -EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r" diff --git a/packages/xorg-fonts/font-util_1.0.0.bb b/packages/xorg-fonts/font-util_1.0.0.bb deleted file mode 100644 index 5bbf7e0809..0000000000 --- a/packages/xorg-fonts/font-util_1.0.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -include font-common.inc - -DEPENDS = "bdftopcf" - -FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*" diff --git a/packages/xorg-lib/.mtn2git_empty b/packages/xorg-lib/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/diet-x11/.mtn2git_empty b/packages/xorg-lib/diet-x11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/diet-x11/X18NCMSstubs.diff b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff new file mode 100644 index 0000000000..54b1727a95 --- /dev/null +++ b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff @@ -0,0 +1,528 @@ +--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 +@@ -83,6 +83,7 @@ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -107,6 +109,7 @@ + * locale + */ + /*ARGSUSED*/ ++#ifdef XLOCALE + int + _XimGetCharCode ( + XPointer ucs_conv, +@@ -135,6 +138,7 @@ + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100 +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include ++#include ++#ifdef WIN32 ++#undef close ++#endif ++#include ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ ; ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100 +@@ -331,6 +331,8 @@ + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -338,7 +340,8 @@ + $(x11data_DATA) \ + os2Stubs.c \ + udcInf.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + # + # Figure out which sub-libraries to link into Xlib +--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100 +@@ -55,7 +55,9 @@ + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -625,9 +627,11 @@ + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; +--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100 +@@ -215,7 +215,14 @@ + esac + AC_SUBST(KEYSYMDEF) + +-AM_CONDITIONAL(UDC, test xfalse = xtrue) ++AC_ARG_ENABLE(udc, ++ AC_HELP_STRING([--disable-udc], ++ [Disable Xlib support for UDC *EXPERIMENTAL*]), ++ [UDC=$enableval],[UDC=yes]) ++AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) ++if test x"$UDC" = "xyes"; then ++ AC_DEFINE(UDC,1,[Include support for UDC]) ++fi + + AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], diff --git a/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..9dbf6dac68 --- /dev/null +++ b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff @@ -0,0 +1,14 @@ +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..a098db1941 --- /dev/null +++ b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h +@@ -103,7 +103,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/packages/xorg-lib/diet-x11_20050226.bb b/packages/xorg-lib/diet-x11_20050226.bb new file mode 100644 index 0000000000..cab8c5d570 --- /dev/null +++ b/packages/xorg-lib/diet-x11_20050226.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/xorg-lib/diet-x11_6.2.1.bb b/packages/xorg-lib/diet-x11_6.2.1.bb new file mode 100644 index 0000000000..643e658412 --- /dev/null +++ b/packages/xorg-lib/diet-x11_6.2.1.bb @@ -0,0 +1,9 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" + diff --git a/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..3e09f9a4b8 --- /dev/null +++ b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb @@ -0,0 +1,15 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +PROVIDES += "libx11" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" + +#do_stage_append () { +# rm -f ${STAGING_INCDIR}/X11/XKBlib.h +#} diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..747c525535 --- /dev/null +++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb @@ -0,0 +1,11 @@ +SECTION = "x11/base" +include libx11_${PV}.bb + +PROVIDES += "libx11" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" diff --git a/packages/xorg-lib/diet-x11_cvs.bb b/packages/xorg-lib/diet-x11_cvs.bb new file mode 100644 index 0000000000..eea73f0964 --- /dev/null +++ b/packages/xorg-lib/diet-x11_cvs.bb @@ -0,0 +1,7 @@ +SECTION = "x11/base" +include libx11_cvs.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" diff --git a/packages/xorg-lib/files/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/packages/xorg-lib/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..dca88fba92 --- /dev/null +++ b/packages/xorg-lib/files/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-6.2.1/include/X11/Xlib.h +@@ -100,7 +100,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..02883c4d26 --- /dev/null +++ b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X fontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib xproto" + +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..b67c4a0e38 --- /dev/null +++ b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X fontenc library (used by libxfont)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "zlib xproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libice/.mtn2git_empty b/packages/xorg-lib/libice/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libice/autofoo.patch b/packages/xorg-lib/libice/autofoo.patch new file mode 100644 index 0000000000..8ab0585fb8 --- /dev/null +++ b/packages/xorg-lib/libice/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400 ++++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500 +@@ -8,12 +8,12 @@ + libICE) + + AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb new file mode 100644 index 0000000000..1311145334 --- /dev/null +++ b/packages/xorg-lib/libice_6.3.3.bb @@ -0,0 +1,18 @@ +SECTION = "libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "libx11" +PROVIDES = "ice" +DESCRIPTION = "X11 ICE library" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libICE-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..cd5c2d372f --- /dev/null +++ b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X11 ICE library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "libx11 util-macros" +PROVIDES = "ice" + +XORG_PN = "libICE" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..a1e92b66fa --- /dev/null +++ b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X11 ICE library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "libx11 util-macros" +PROVIDES = "ice" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libICE" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb new file mode 100644 index 0000000000..90c98d594a --- /dev/null +++ b/packages/xorg-lib/libice_cvs.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libx11" +PROVIDES = "ice" +DESCRIPTION = "X11 ICE library" +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE" +S = "${WORKDIR}/ICE" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/liblbxutil/.mtn2git_empty b/packages/xorg-lib/liblbxutil/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/liblbxutil/mkg3states.patch b/packages/xorg-lib/liblbxutil/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/packages/xorg-lib/liblbxutil/mkg3states.patch @@ -0,0 +1,51 @@ +--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 ++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 +@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 ++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 +@@ -1,9 +1,6 @@ + lib_LTLIBRARIES = liblbxutil.la + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 + +--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 ++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..36837c23e4 --- /dev/null +++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "xextproto" + +XORG_PN = "${PN}" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \ + file://mkg3states.patch;patch=1" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" diff --git a/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..795cd4555d --- /dev/null +++ b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "xproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \ + file://mkg3states.patch;patch=1" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" diff --git a/packages/xorg-lib/libsm/.mtn2git_empty b/packages/xorg-lib/libsm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libsm/autofoo.patch b/packages/xorg-lib/libsm/autofoo.patch new file mode 100644 index 0000000000..8cb204a66e --- /dev/null +++ b/packages/xorg-lib/libsm/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libSM-6.0.3/configure.ac~autofoo 2004-05-11 01:51:21.000000000 -0400 ++++ libSM-6.0.3/configure.ac 2005-01-18 12:15:50.405356376 -0500 +@@ -8,12 +8,12 @@ + libSM) + + AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb new file mode 100644 index 0000000000..08f9597045 --- /dev/null +++ b/packages/xorg-lib/libsm_6.0.3.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +LICENSE = "MIT-X" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "libx11 libice" +DESCRIPTION = "Session management library" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libSM-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..bf96271ba6 --- /dev/null +++ b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Session management library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT-X" +#PV="1:1.0.0" + +DEPENDS = "libx11 libice util-macros" + +XORG_PN = "libSM" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..468b014165 --- /dev/null +++ b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Session management library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT-X" +#PV="1:1.0.1" + +DEPENDS = "libx11 libice util-macros" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libSM" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb new file mode 100644 index 0000000000..22b316cf57 --- /dev/null +++ b/packages/xorg-lib/libsm_cvs.bb @@ -0,0 +1,18 @@ +PV = "6.0.3+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libx11 libice" +DESCRIPTION = "Session management library" +PR = "r1" + +DEFAULT_PREFERENCE="-1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM" +S = "${WORKDIR}/SM" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libx11-native_6.2.1.bb b/packages/xorg-lib/libx11-native_6.2.1.bb new file mode 100644 index 0000000000..9513c4237e --- /dev/null +++ b/packages/xorg-lib/libx11-native_6.2.1.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" +include libx11_${PV}.bb +inherit native +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libx11-native_cvs.bb b/packages/xorg-lib/libx11-native_cvs.bb new file mode 100644 index 0000000000..5b221122d3 --- /dev/null +++ b/packages/xorg-lib/libx11-native_cvs.bb @@ -0,0 +1,5 @@ +SECTION = "x11/base" +include libx11_cvs.bb +inherit native +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libx11/.mtn2git_empty b/packages/xorg-lib/libx11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libx11/autofoo.patch b/packages/xorg-lib/libx11/autofoo.patch new file mode 100644 index 0000000000..8bdba09768 --- /dev/null +++ b/packages/xorg-lib/libx11/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/configure.ac~autofoo ++++ libX11-6.2.1/configure.ac +@@ -7,12 +7,12 @@ + [jg@freedesktop.org], + libX11) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_AUX_DIR(.) + ++AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([src/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libx11/xim.patch b/packages/xorg-lib/libx11/xim.patch new file mode 100644 index 0000000000..0eab197a80 --- /dev/null +++ b/packages/xorg-lib/libx11/xim.patch @@ -0,0 +1,55 @@ +--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000 ++++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000 +@@ -90,6 +90,52 @@ + return; + } + ++XIM ++XOpenIM ( ++ Display* display, ++ struct _XrmHashBucketRec* rdb, ++ char* res_name, ++ char* res_class) ++{ ++ return (XIM) NULL; ++} ++ ++Status ++XCloseIM ( XIM im ) ++{ ++ return NULL; ++} ++ ++XIC ++XCreateIC ( XIM im, ...) ++{ ++ return NULL; ++} ++ ++void ++XDestroyIC ( XIC ic ) ++{ ++ return; ++} ++ ++int ++XmbLookupString ( ++ XIC ic, ++ XKeyPressedEvent* ev, ++ char* buffer, ++ int nbytes, ++ KeySym* keysym, ++ Status* status) ++{ ++ return XLookupNone; ++} ++ ++char * ++XGetICValues( XIC ic, ...) ++{ ++ return (char *) NULL; ++} ++ + XPointer + _XimGetLocaleCode ( _Xconst char* encoding_name ) + { diff --git a/packages/xorg-lib/libx11_20050226.bb b/packages/xorg-lib/libx11_20050226.bb new file mode 100644 index 0000000000..0bc30a42cc --- /dev/null +++ b/packages/xorg-lib/libx11_20050226.bb @@ -0,0 +1,6 @@ +SRCDATE = "20050226" + +include libx11_cvs.bb + +DEFAULT_PREFERENCE = "0" + diff --git a/packages/xorg-lib/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb new file mode 100644 index 0000000000..901746bafa --- /dev/null +++ b/packages/xorg-lib/libx11_6.2.1.bb @@ -0,0 +1,40 @@ +SECTION = "x11/libs" +LICENSE = "XFree86" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xextensions libxau xtrans libxdmcp" +PROVIDES = "x11" +DESCRIPTION = "Base X libs." +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" +PR = "r4" + +SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ + file://errordb-keysymdb-path-fix.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libX11-${PV}" + +inherit autotools pkgconfig + +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + oe_runmake +} + +do_stage() { + install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h + install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h + install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h + install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h + install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h + install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h + install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h + install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h + install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h + + oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..ac9d87292a --- /dev/null +++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +XORG_PN = "libX11" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..6836c872bd --- /dev/null +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Base X libs." +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +XORG_PN = "libX11" +XORG_RELEASE = "X11R7.1" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} diff --git a/packages/xorg-lib/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb new file mode 100644 index 0000000000..d44dd76aac --- /dev/null +++ b/packages/xorg-lib/libx11_cvs.bb @@ -0,0 +1,41 @@ +PV = "6.2.1+cvs${SRCDATE}" +LICENSE = "XFree86" +PR = "r6" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xextensions libxau xtrans libxdmcp" +PROVIDES = "x11" +DESCRIPTION = "Base X libs." +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \ + file://errordb-keysymdb-path-fix.patch;patch=1" +S = "${WORKDIR}/X11" + +inherit autotools pkgconfig + +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h + install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h + install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h + install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h + install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h + install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h + install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h + install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h + install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h + + oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb new file mode 100644 index 0000000000..ed6623f03a --- /dev/null +++ b/packages/xorg-lib/libx11_git.bb @@ -0,0 +1,32 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxau-native_0.1.1.bb b/packages/xorg-lib/libxau-native_0.1.1.bb new file mode 100644 index 0000000000..ecb71ce3d6 --- /dev/null +++ b/packages/xorg-lib/libxau-native_0.1.1.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" +include libxau_${PV}.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libxau-native_cvs.bb b/packages/xorg-lib/libxau-native_cvs.bb new file mode 100644 index 0000000000..cd070033ce --- /dev/null +++ b/packages/xorg-lib/libxau-native_cvs.bb @@ -0,0 +1,6 @@ +SECTION = "x11/base" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau" +include libxau_cvs.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libxau/.mtn2git_empty b/packages/xorg-lib/libxau/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxau/autofoo.patch b/packages/xorg-lib/libxau/autofoo.patch new file mode 100644 index 0000000000..1e42eb974d --- /dev/null +++ b/packages/xorg-lib/libxau/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libXau-0.1.1/configure.ac~autofoo ++++ libXau-0.1.1/configure.ac +@@ -25,11 +25,10 @@ + + AC_PREREQ([2.57]) + AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau) +-AM_INIT_AUTOMAKE([dist-bzip2]) +-AM_MAINTAINER_MODE +- + AM_CONFIG_HEADER(config.h) + AC_CONFIG_AUX_DIR(.) ++AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_MAINTAINER_MODE + + AC_PROG_CC + AC_PROG_INSTALL diff --git a/packages/xorg-lib/libxau_0.1.1.bb b/packages/xorg-lib/libxau_0.1.1.bb new file mode 100644 index 0000000000..dc1a28171b --- /dev/null +++ b/packages/xorg-lib/libxau_0.1.1.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xau" +DESCRIPTION = "Authorization Protocol for X." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXau-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..f64be68583 --- /dev/null +++ b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Authorization Protocol for X." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xau" + +XORG_PN = "libXau" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..39e2f88b95 --- /dev/null +++ b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Authorization Protocol for X." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xau" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXau" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxau_cvs.bb b/packages/xorg-lib/libxau_cvs.bb new file mode 100644 index 0000000000..518744816d --- /dev/null +++ b/packages/xorg-lib/libxau_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +PR = "r1" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xau" +DESCRIPTION = "Authorization Protocol for X." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau" +S = "${WORKDIR}/Xau" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxaw/.mtn2git_empty b/packages/xorg-lib/libxaw/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxaw/auxdir.patch b/packages/xorg-lib/libxaw/auxdir.patch new file mode 100644 index 0000000000..4226ab6a4d --- /dev/null +++ b/packages/xorg-lib/libxaw/auxdir.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.ac 2005-06-17 21:26:17.519157272 +0200 ++++ libXaw-7.0.2/configure.ac 2005-06-17 21:26:34.832525240 +0200 +@@ -10,7 +10,6 @@ + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb new file mode 100644 index 0000000000..929b54a127 --- /dev/null +++ b/packages/xorg-lib/libxaw_7.0.2.bb @@ -0,0 +1,21 @@ +SECTION = "x11/libs" +LICENSE = "MIT" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" +DESCRIPTION = "X Athena Widgets library" + +SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \ + file://auxdir.patch;patch=1" + +S = "${WORKDIR}/libXaw-${PV}" + +inherit autotools pkgconfig + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..03ac373f77 --- /dev/null +++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X Athena Widgets library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" + +XORG_PN = "libXaw" + +include xorg-xlibs.inc + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" diff --git a/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..7fb68385a1 --- /dev/null +++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Athena Widgets library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXaw" + +include xorg-xlibs.inc + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" diff --git a/packages/xorg-lib/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb new file mode 100644 index 0000000000..7860f6e6b1 --- /dev/null +++ b/packages/xorg-lib/libxaw_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" +DESCRIPTION = "X Athena Widgets library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw" +S = "${WORKDIR}/Xaw" + +inherit autotools pkgconfig + +# FIXME: libXaw needs a full x11, not diet +BROKEN = "1" + +do_stage () { + oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} +} diff --git a/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch new file mode 100644 index 0000000000..072cf25214 --- /dev/null +++ b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch @@ -0,0 +1,17 @@ +Index: libXcomposite-1.0.1/configure.ac +=================================================================== +--- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500 ++++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxcomposite/.mtn2git_empty b/packages/xorg-lib/libxcomposite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxcomposite/change-include-order.patch b/packages/xorg-lib/libxcomposite/change-include-order.patch new file mode 100644 index 0000000000..630b8818fc --- /dev/null +++ b/packages/xorg-lib/libxcomposite/change-include-order.patch @@ -0,0 +1,14 @@ +This patch makes the build use its own Xcomposite.h over rather than an +older Xcomposite.h that might already be installed in the staging dir. + +--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 ++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 +@@ -21,7 +21,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) + + lib_LTLIBRARIES = libXcomposite.la + diff --git a/packages/xorg-lib/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb new file mode 100644 index 0000000000..e2ca3bbc7b --- /dev/null +++ b/packages/xorg-lib/libxcomposite_1.0.1.bb @@ -0,0 +1,16 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" +DESCRIPTION = "X Composite extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXcomposite-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb new file mode 100644 index 0000000000..d3166a99f4 --- /dev/null +++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "X Composite extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 compositeproto xextproto libxfixes" +PROVIDES = "xcomposite" + +XORG_PN = "libXcomposite" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \ + file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb new file mode 100644 index 0000000000..2847ada716 --- /dev/null +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X Composite extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 compositeproto libxfixes" +PROVIDES = "xcomposite" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXcomposite" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \ + file://change-include-order.patch;patch=1" diff --git a/packages/xorg-lib/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb new file mode 100644 index 0000000000..1d8b69c8c6 --- /dev/null +++ b/packages/xorg-lib/libxcomposite_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" +DESCRIPTION = "X Composite extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite" +S = "${WORKDIR}/Xcomposite" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch new file mode 100644 index 0000000000..99cd45a7ea --- /dev/null +++ b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXcursor-1.1.2/configure.ac~autofoo 2004-01-16 23:38:26.000000000 -0500 ++++ libXcursor-1.1.2/configure.ac 2005-01-18 13:40:06.539707120 -0500 +@@ -31,11 +31,11 @@ + dnl not possible to extract the version number here from Xcursor.h + dnl + AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AC_CONFIG_SRCDIR([Makefile.am]) + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + dnl libtool versioning + diff --git a/packages/xorg-lib/libxcursor/.mtn2git_empty b/packages/xorg-lib/libxcursor/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxcursor/autofoo.patch b/packages/xorg-lib/libxcursor/autofoo.patch new file mode 100644 index 0000000000..7aa573ce13 --- /dev/null +++ b/packages/xorg-lib/libxcursor/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: Xcursor/configure.ac +=================================================================== +--- Xcursor.orig/configure.ac 2004-04-12 10:11:12.000000000 -0400 ++++ Xcursor/configure.ac 2005-01-18 16:04:36.860617992 -0500 +@@ -31,11 +31,11 @@ + dnl not possible to extract the version number here from Xcursor.h + dnl + AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AC_CONFIG_SRCDIR([Makefile.am]) + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + dnl libtool versioning + diff --git a/packages/xorg-lib/libxcursor_1.1.2.bb b/packages/xorg-lib/libxcursor_1.1.2.bb new file mode 100644 index 0000000000..25744c7dca --- /dev/null +++ b/packages/xorg-lib/libxcursor_1.1.2.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DESCRIPTION = "X Cursor library" +DEPENDS = "libxfixes" +PR = "r2" + +SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXcursor-${PV}" +FILES_${PN} += "${libdir}/libXcursor.so" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb new file mode 100644 index 0000000000..9aed134fbb --- /dev/null +++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Cursor library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libxfixes" + +XORG_PN = "libXcursor" + +include xorg-xlibs.inc + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb new file mode 100644 index 0000000000..20f44bfb41 --- /dev/null +++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "X Cursor library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libxfixes" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXcursor" + +include xorg-xlibs.inc + +FILES_${PN} += "${libdir}/libXcursor.so" diff --git a/packages/xorg-lib/libxcursor_cvs.bb b/packages/xorg-lib/libxcursor_cvs.bb new file mode 100644 index 0000000000..5fe2334b85 --- /dev/null +++ b/packages/xorg-lib/libxcursor_cvs.bb @@ -0,0 +1,17 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +DESCRIPTION = "X Cursor library" +DEPENDS = "libxfixes" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor" +S = "${WORKDIR}/Xcursor" +FILES_${PN} += "${libdir}/libXcursor.so" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch new file mode 100644 index 0000000000..1e3ec45d4a --- /dev/null +++ b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch @@ -0,0 +1,17 @@ +Index: libXdamage-1.0.1/configure.ac +=================================================================== +--- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500 ++++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxdamage/.mtn2git_empty b/packages/xorg-lib/libxdamage/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxdamage/m4.patch b/packages/xorg-lib/libxdamage/m4.patch new file mode 100644 index 0000000000..393f3d13d2 --- /dev/null +++ b/packages/xorg-lib/libxdamage/m4.patch @@ -0,0 +1,65 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null ++++ Xdamage/m4/pkg.m4 +@@ -0,0 +1,57 @@ ++ ++dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) ++dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page ++dnl also defines GSTUFF_PKG_ERRORS on error ++AC_DEFUN(PKG_CHECK_MODULES, [ ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ AC_MSG_CHECKING(for $2) ++ ++ if $PKG_CONFIG --exists "$2" ; then ++ AC_MSG_RESULT(yes) ++ succeeded=yes ++ ++ AC_MSG_CHECKING($1_CFLAGS) ++ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` ++ AC_MSG_RESULT($$1_CFLAGS) ++ ++ AC_MSG_CHECKING($1_LIBS) ++ $1_LIBS=`$PKG_CONFIG --libs "$2"` ++ AC_MSG_RESULT($$1_LIBS) ++ else ++ $1_CFLAGS="" ++ $1_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ ifelse([$4], ,echo $$1_PKG_ERRORS,) ++ fi ++ ++ AC_SUBST($1_CFLAGS) ++ AC_SUBST($1_LIBS) ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ ifelse([$3], , :, [$3]) ++ else ++ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) ++ fi ++]) ++ ++ diff --git a/packages/xorg-lib/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb new file mode 100644 index 0000000000..040e863447 --- /dev/null +++ b/packages/xorg-lib/libxdamage_1.0.1.bb @@ -0,0 +1,17 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" +DESCRIPTION = "X Damage extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ + file://m4.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXdamage-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb new file mode 100644 index 0000000000..acea09c7bd --- /dev/null +++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X Damage extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 damageproto libxfixes xproto" +PROVIDES = "xdamage" + +XORG_PN = "libXdamage" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..b97e01cfb0 --- /dev/null +++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Damage extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 damageproto libxfixes xproto" +PROVIDES = "xdamage" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXdamage" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb new file mode 100644 index 0000000000..ba8a68033a --- /dev/null +++ b/packages/xorg-lib/libxdamage_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" +DESCRIPTION = "X Damage extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \ + file://m4.patch;patch=1" +S = "${WORKDIR}/Xdamage" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxdmcp-native_0.1.1.bb b/packages/xorg-lib/libxdmcp-native_0.1.1.bb new file mode 100644 index 0000000000..bd6d990f53 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_0.1.1.bb @@ -0,0 +1,5 @@ +SECTION = "x11/libs" +include libxdmcp_${PV}.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libxdmcp-native_0.1.3.bb b/packages/xorg-lib/libxdmcp-native_0.1.3.bb new file mode 100644 index 0000000000..8d7162b351 --- /dev/null +++ b/packages/xorg-lib/libxdmcp-native_0.1.3.bb @@ -0,0 +1,6 @@ +SECTION = "x11/libs" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp" +include libxdmcp_${PV}.bb +inherit native +DEPENDS = "xproto-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libxdmcp/.mtn2git_empty b/packages/xorg-lib/libxdmcp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxdmcp/autofoo.patch b/packages/xorg-lib/libxdmcp/autofoo.patch new file mode 100644 index 0000000000..ff1a76ad04 --- /dev/null +++ b/packages/xorg-lib/libxdmcp/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libXdmcp-0.1.3/configure.ac~autofoo ++++ libXdmcp-0.1.3/configure.ac +@@ -25,12 +25,11 @@ + + AC_PREREQ([2.57]) + AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp) ++AC_CONFIG_AUX_DIR(.) ++AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE +- + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) +-AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h]) + + AC_PROG_CC + AC_PROG_INSTALL diff --git a/packages/xorg-lib/libxdmcp_0.1.1.bb b/packages/xorg-lib/libxdmcp_0.1.1.bb new file mode 100644 index 0000000000..19fba1529e --- /dev/null +++ b/packages/xorg-lib/libxdmcp_0.1.1.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." +PR = "r1" +S = "${WORKDIR}/libXdmcp-${PV}" + +SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxdmcp_0.1.3.bb b/packages/xorg-lib/libxdmcp_0.1.3.bb new file mode 100644 index 0000000000..aa2736cdb2 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_0.1.3.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE= "MIT" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." +PR = "r1" +S = "${WORKDIR}/libXdmcp-${PV}" + +SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..5ea8cdd513 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Display Manager Control Protocol library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xdmcp" + +XORG_PN = "libXdmcp" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..d9cfadbf7b --- /dev/null +++ b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Display Manager Control Protocol library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto util-macros" +PROVIDES = "xdmcp" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXdmcp" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxdmcp_cvs.bb b/packages/xorg-lib/libxdmcp_cvs.bb new file mode 100644 index 0000000000..20b957b522 --- /dev/null +++ b/packages/xorg-lib/libxdmcp_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +PR = "r1" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp" +S = "${WORKDIR}/Xdmcp" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb new file mode 100644 index 0000000000..9294b080b7 --- /dev/null +++ b/packages/xorg-lib/libxext-native_cvs.bb @@ -0,0 +1,6 @@ +SECTION = "unknown" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext" +include libxext_${PV}.bb +inherit native +DEPENDS = "libx11-native xextensions-native" +PROVIDES = "" diff --git a/packages/xorg-lib/libxext/.mtn2git_empty b/packages/xorg-lib/libxext/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxext/autofoo.patch b/packages/xorg-lib/libxext/autofoo.patch new file mode 100644 index 0000000000..c006884526 --- /dev/null +++ b/packages/xorg-lib/libxext/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Xext/configure.ac~autofoo ++++ Xext/configure.ac +@@ -8,9 +8,8 @@ + libXext) + + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) +- + AC_CONFIG_AUX_DIR(.) ++AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + diff --git a/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..1c4a21280e --- /dev/null +++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto libx11 xextproto util-macros" +PROVIDES = "xext" + +EXTRA_OECONF="--enable-malloc0returnsnull" + +XORG_PN = "libXext" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..5ee1d82990 --- /dev/null +++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE= "MIT" + +DEPENDS = "xproto libx11 util-macros" +PROVIDES = "xext" + +EXTRA_OECONF="--enable-malloc0returnsnull" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXext" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb new file mode 100644 index 0000000000..0ef675ca70 --- /dev/null +++ b/packages/xorg-lib/libxext_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +PR = "r1" +LICENSE= "MIT" +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "xproto libx11 xextensions" +PROVIDES = "xext" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" +S = "${WORKDIR}/Xext" + +inherit autotools pkgconfig +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxfixes/.mtn2git_empty b/packages/xorg-lib/libxfixes/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxfixes/autofoo.patch b/packages/xorg-lib/libxfixes/autofoo.patch new file mode 100644 index 0000000000..26803cf7f3 --- /dev/null +++ b/packages/xorg-lib/libxfixes/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXfixes-2.0.1/configure.ac~autofoo 2004-01-15 03:40:23.000000000 -0500 ++++ libXfixes-2.0.1/configure.ac 2005-01-18 13:35:33.461221360 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb new file mode 100644 index 0000000000..710fa17454 --- /dev/null +++ b/packages/xorg-lib/libxfixes_2.0.1.bb @@ -0,0 +1,15 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "libx11 fixesext" +DESCRIPTION = "X Fixes extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXfixes-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb new file mode 100644 index 0000000000..b22da223f5 --- /dev/null +++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "X Fixes extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 fixesproto" + +XORG_PN = "libXfixes" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb new file mode 100644 index 0000000000..5b8881e0b8 --- /dev/null +++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X Fixes extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE= "BSD-X" + +DEPENDS = "libx11 fixesproto" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXfixes" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb new file mode 100644 index 0000000000..4494dc9326 --- /dev/null +++ b/packages/xorg-lib/libxfixes_cvs.bb @@ -0,0 +1,14 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "BSD-X" +SECTION = "x11/libs" +DEPENDS = "libx11 fixesext" +DESCRIPTION = "X Fixes extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" +S = "${WORKDIR}/Xfixes" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxfont/.mtn2git_empty b/packages/xorg-lib/libxfont/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch new file mode 100644 index 0000000000..4998625c24 --- /dev/null +++ b/packages/xorg-lib/libxfont/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 ++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 +@@ -35,9 +35,9 @@ + dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's + dnl not possible to extract the version number here from Xfont.h + dnl ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) + + # Check for progs diff --git a/packages/xorg-lib/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch new file mode 100644 index 0000000000..7f97b9a8f6 --- /dev/null +++ b/packages/xorg-lib/libxfont/scalable.patch @@ -0,0 +1,27 @@ +Index: fontfile/fontdir.c +=================================================================== +RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v +retrieving revision 3.22 +diff -u -r3.22 fontdir.c +--- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 ++++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 +@@ -699,6 +699,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -798,6 +803,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } diff --git a/packages/xorg-lib/libxfont_1.4.2.bb b/packages/xorg-lib/libxfont_1.4.2.bb new file mode 100644 index 0000000000..0cc45397fe --- /dev/null +++ b/packages/xorg-lib/libxfont_1.4.2.bb @@ -0,0 +1,19 @@ +SECTION = "x11/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" +DESCRIPTION = "X font library (used by the X server)." +PR = "r2" + +SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ + file://scalable.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXfont-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..aff0e55e21 --- /dev/null +++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..d17359dc29 --- /dev/null +++ b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +PROVIDES = "xfont" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXfont" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb new file mode 100644 index 0000000000..2701aef825 --- /dev/null +++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.2.0" diff --git a/packages/xorg-lib/libxfont_cvs.bb b/packages/xorg-lib/libxfont_cvs.bb new file mode 100644 index 0000000000..bd21e0fd12 --- /dev/null +++ b/packages/xorg-lib/libxfont_cvs.bb @@ -0,0 +1,18 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" +DESCRIPTION = "X font library (used by the X server)." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \ + file://scalable.patch;patch=1" +S = "${WORKDIR}/Xfont" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxft/.mtn2git_empty b/packages/xorg-lib/libxft/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxft/autofoo.patch b/packages/xorg-lib/libxft/autofoo.patch new file mode 100644 index 0000000000..54120aa612 --- /dev/null +++ b/packages/xorg-lib/libxft/autofoo.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXft-2.1.6/configure.ac~autofoo 2004-03-22 10:02:59.000000000 -0500 ++++ libXft-2.1.6/configure.ac 2005-01-17 02:08:10.165951760 -0500 +@@ -33,12 +33,12 @@ + dnl Please bump the minor library number at each release as well. + dnl + AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft) ++AC_CONFIG_AUX_DIR(.) + + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # checks for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb new file mode 100644 index 0000000000..c3f1f74e40 --- /dev/null +++ b/packages/xorg-lib/libxft_2.1.6.bb @@ -0,0 +1,27 @@ +SECTION = "x11/libs" +LICENSE = "MIT-X" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." +PROVIDES = "xft" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXft-${PV}" + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb new file mode 100644 index 0000000000..f1b6456740 --- /dev/null +++ b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." +LICENSE = "MIT-X" +SECTION = "x11/libs" + +DEPENDS = "libx11 xproto libxrender freetype fontconfig" +PROVIDES = "xft" + + +XORG_PN = "libXft" + +include xorg-xlibs.inc + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} diff --git a/packages/xorg-lib/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb new file mode 100644 index 0000000000..6c1a5f5c32 --- /dev/null +++ b/packages/xorg-lib/libxft_cvs.bb @@ -0,0 +1,26 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "x11/libs" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." +PROVIDES = "xft" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft" +S = "${WORKDIR}/Xft" + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} diff --git a/packages/xorg-lib/libxi/.mtn2git_empty b/packages/xorg-lib/libxi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxi/autofoo.patch b/packages/xorg-lib/libxi/autofoo.patch new file mode 100644 index 0000000000..f1bce9ed7a --- /dev/null +++ b/packages/xorg-lib/libxi/autofoo.patch @@ -0,0 +1,12 @@ +Index: libXi-6.0.1/configure.ac +=================================================================== +--- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500 ++++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500 +@@ -8,7 +8,6 @@ + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb new file mode 100644 index 0000000000..5c44d06df3 --- /dev/null +++ b/packages/xorg-lib/libxi_6.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "X Input Extension library" +LICENSE = "MIT-X" +SECTION = "x11/libs" +DEPENDS = "xproto libx11 xextensions" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXi-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..4e357cde7c --- /dev/null +++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X Input extension library." +SECTION = "x11/libs" +LICENSE = "MIT-X" + +DEPENDS = "xproto libx11 libxext" + +XORG_PN = "libXi" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..d698f04ee1 --- /dev/null +++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Input extension library." +SECTION = "x11/libs" +LICENSE = "MIT-X" + +DEPENDS = "xproto libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXi" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb new file mode 100644 index 0000000000..767c641a95 --- /dev/null +++ b/packages/xorg-lib/libxi_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT-X" +SECTION = "x11/libs" +DEPENDS = "xproto libx11 xextensions" +DESCRIPTION = "X Input extension library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/Xi" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb new file mode 100644 index 0000000000..dc5d82b9b0 --- /dev/null +++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xinerama library" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" +S = "${WORKDIR}/Xinerama" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb new file mode 100644 index 0000000000..a267e6c2d9 --- /dev/null +++ b/packages/xorg-lib/libxinerama_1.0.2.bb @@ -0,0 +1,17 @@ +LICENSE = "MIT" +DESCRIPTION = "Xinerama library" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2" +S = "${WORKDIR}/libXinerama-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..09a4f564f5 --- /dev/null +++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Xinerama library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "xineramaproto xproto libx11 libxext" +PROVIDES = "xinerama" + +XORG_PN = "libXinerama" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb new file mode 100644 index 0000000000..3e959df19e --- /dev/null +++ b/packages/xorg-lib/libxinerama_cvs.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xinerama library" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" +PV = "0.0+cvs${SRCDATE}" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama" +S = "${WORKDIR}/Xinerama" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..5cbc9a1150 --- /dev/null +++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11" + +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..36e3e5f600 --- /dev/null +++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb new file mode 100644 index 0000000000..1b433ef65f --- /dev/null +++ b/packages/xorg-lib/libxkbfile_cvs.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +PV = "0.0+cvs${SRCDATE}" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libx11" +DESCRIPTION = "X11 keyboard library" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" +S = "${WORKDIR}/xkbfile" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..ded3da66f3 --- /dev/null +++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxt libxkbfile kbproto" + +XORG_PN = "${PN}" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..a914f1e0ef --- /dev/null +++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X11 keyboard library" +SECTION = "libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxt libxkbfile" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "${PN}" + +include xorg-xlibs.inc + diff --git a/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..1693e5d0d5 --- /dev/null +++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "X Window System miscellaneous utility library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libxt libxext util-macros" +PROVIDES = "xmu" + +XORG_PN = "libXmu" + +include xorg-xlibs.inc + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..cc06d2a671 --- /dev/null +++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "X Window System miscellaneous utility library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libxt libxext util-macros" +PROVIDES = "xmu" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXmu" + +include xorg-xlibs.inc + +PACKAGES =+ "libxmuu libxmuu-dev" + +FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES_libxmuu-dev = "${libdir}/libXmuu.so" + +LEAD_SONAME = "libXmu" diff --git a/packages/xorg-lib/libxmu_cvs.bb b/packages/xorg-lib/libxmu_cvs.bb new file mode 100644 index 0000000000..500b373c32 --- /dev/null +++ b/packages/xorg-lib/libxmu_cvs.bb @@ -0,0 +1,21 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libxt libxext" +PROVIDES = "xmu" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu" +S = "${WORKDIR}/Xmu" + +PACKAGES =+ "xmuu xmuu-dev" + +FILES_xmuu = "${libdir}/libXmuu.so.*" +FILES_xmuu-dev = "${libdir}/libXmuu.so" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..15653f1390 --- /dev/null +++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X print extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext xextproto libxau printproto" + +XORG_PN = "libXp" + +include xorg-xlibs.inc + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb new file mode 100644 index 0000000000..eaf6546d0e --- /dev/null +++ b/packages/xorg-lib/libxp_cvs.bb @@ -0,0 +1,18 @@ + +LICENSE = "MIT" +PV = "0.0+cvs${SRCDATE}" + +SECTION = "libs" +DEPENDS = "libx11 libxext" +DESCRIPTION = "X print extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" +S = "${WORKDIR}/Xp" + +inherit autotools pkgconfig + +CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxpm/.mtn2git_empty b/packages/xorg-lib/libxpm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxpm/autofoo.patch b/packages/xorg-lib/libxpm/autofoo.patch new file mode 100644 index 0000000000..6b2174bf02 --- /dev/null +++ b/packages/xorg-lib/libxpm/autofoo.patch @@ -0,0 +1,18 @@ +Index: libXpm-3.5.1/configure.ac +=================================================================== +--- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400 ++++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500 +@@ -1,12 +1,12 @@ + AC_PREREQ(2.57) + AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm) + AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([lib/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/packages/xorg-lib/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb new file mode 100644 index 0000000000..513261efd3 --- /dev/null +++ b/packages/xorg-lib/libxpm_3.5.1.bb @@ -0,0 +1,19 @@ +SECTION = "x11/libs" +LICENSE = "X-BSD" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto libx11" +PROVIDES = "xpm" +DESCRIPTION = "X Pixmap library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXpm-${PV}" + +inherit autotools pkgconfig + +do_stage () { + install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb new file mode 100644 index 0000000000..c88bd3f6bc --- /dev/null +++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "X Pixmap library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-BSD" +PR = "r1" + +DEPENDS = "xproto libx11 util-macros" + +XORG_PN = "libXpm" + +include xorg-xlibs.inc + +do_stage () { + install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so libXpm ${STAGING_LIBDIR} +} + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb new file mode 100644 index 0000000000..397be2faf4 --- /dev/null +++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "X Pixmap library." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-BSD" + +DEPENDS = "xproto libx11 util-macros" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXpm" + +include xorg-xlibs.inc + +do_stage () { + install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so libXpm ${STAGING_LIBDIR} +} + +PACKAGES =+ "sxpm cxpm" +FILES_cxpm = "${bindir}/cxpm" +FILES_sxpm = "${bindir}/sxpm" diff --git a/packages/xorg-lib/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb new file mode 100644 index 0000000000..1b46855735 --- /dev/null +++ b/packages/xorg-lib/libxpm_cvs.bb @@ -0,0 +1,19 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "X-BSD" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto libx11" +PROVIDES = "xpm" +DESCRIPTION = "X Pixmap library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm" +S = "${WORKDIR}/Xpm" + +inherit autotools pkgconfig + +do_stage () { + install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h + oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch new file mode 100644 index 0000000000..21f6e7fd78 --- /dev/null +++ b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXrandr-1.0.2/configure.ac~autofoo 2004-01-15 03:23:00.000000000 -0500 ++++ libXrandr-1.0.2/configure.ac 2005-01-16 11:18:35.924069872 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxrandr/.mtn2git_empty b/packages/xorg-lib/libxrandr/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxrandr/autofoo.patch b/packages/xorg-lib/libxrandr/autofoo.patch new file mode 100644 index 0000000000..7b1db760f2 --- /dev/null +++ b/packages/xorg-lib/libxrandr/autofoo.patch @@ -0,0 +1,30 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Xrandr/configure.ac~autofoo.patch 2004-07-01 15:01:55.000000000 -0400 ++++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500 +@@ -33,11 +33,11 @@ + dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC +--- Xrandr/ChangeLog~autofoo.patch 2004-09-19 04:53:38.000000000 -0400 ++++ Xrandr/ChangeLog 2005-01-16 11:52:29.694889712 -0500 +@@ -1,3 +1,7 @@ ++2005-01-16 Chris Larson ++ ++ * configure.ac: Fix to work with automake 1.9.x. ++ + 2004-09-19 Carlos Romero + + * Makefile.am: diff --git a/packages/xorg-lib/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb new file mode 100644 index 0000000000..efd0505544 --- /dev/null +++ b/packages/xorg-lib/libxrandr_1.0.2.bb @@ -0,0 +1,15 @@ +SECTION = "x11/libs" +LICENSE = "BSD-X" +DEPENDS = "randrext libx11 libxrender libxext" +DESCRIPTION = "X Resize and Rotate extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXrandr-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb new file mode 100644 index 0000000000..3081f4ab86 --- /dev/null +++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Resize and Rotate extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "randrproto libx11 libxrender libxext" + +XORG_PN = "libXrandr" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb new file mode 100644 index 0000000000..0c7978945a --- /dev/null +++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Resize and Rotate extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "randrproto libx11 libxrender libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXrandr" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb new file mode 100644 index 0000000000..3b6fd02de8 --- /dev/null +++ b/packages/xorg-lib/libxrandr_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +DEPENDS = "randrext libx11 libxrender libxext" +DESCRIPTION = "X Resize and Rotate extension library." +PR = "r1" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr" +S = "${WORKDIR}/Xrandr" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxrender/.mtn2git_empty b/packages/xorg-lib/libxrender/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxrender/autofoo.patch b/packages/xorg-lib/libxrender/autofoo.patch new file mode 100644 index 0000000000..eb21c766f8 --- /dev/null +++ b/packages/xorg-lib/libxrender/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libXrender-0.8.4/configure.ac~autofoo ++++ libXrender-0.8.4/configure.ac +@@ -33,11 +33,10 @@ + dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE +- + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb new file mode 100644 index 0000000000..b36c5701ba --- /dev/null +++ b/packages/xorg-lib/libxrender_0.8.4.bb @@ -0,0 +1,15 @@ +SECTION = "libs" +DEPENDS = "renderext libx11" +DESCRIPTION = "X Render extension library." +LICENSE = "BSD" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXrender-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb new file mode 100644 index 0000000000..1cff60983a --- /dev/null +++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Render extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "BSD" + +DEPENDS = "renderproto libx11" + +XORG_PN = "libXrender" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb new file mode 100644 index 0000000000..1ee518645b --- /dev/null +++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Render extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "BSD" + +DEPENDS = "renderproto libx11" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXrender" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb new file mode 100644 index 0000000000..ea6b1f4607 --- /dev/null +++ b/packages/xorg-lib/libxrender_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +PR = "r1" +SECTION = "libs" +DEPENDS = "renderext libx11" +DESCRIPTION = "X Render extension library." +LICENSE = "BSD" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender" +S = "${WORKDIR}/Xrender" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb new file mode 100644 index 0000000000..c01731d37a --- /dev/null +++ b/packages/xorg-lib/libxres_1.0.1.bb @@ -0,0 +1,14 @@ +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert " +DEPENDS = "libx11 xextensions libxext resourceext" +PROVIDES = "xres" +DESCRIPTION = "X Resource usage library." +LICENSE = "X-MIT" +SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2" +S = "${WORKDIR}/libXres-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..a9806f57b1 --- /dev/null +++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "X Resource usage library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 xextproto libxext resourceproto" +PROVIDES = "xres" + +XORG_PN = "libXres" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..e2ac5aee7b --- /dev/null +++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "X Resource usage library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libxext" +PROVIDES = "xres" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXres" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb new file mode 100644 index 0000000000..e3e5c6704c --- /dev/null +++ b/packages/xorg-lib/libxres_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert " +DEPENDS = "libx11 xextensions libxext resourceext" +PROVIDES = "xres" +DESCRIPTION = "X Resource usage library." +LICENSE = "X-MIT" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes" +S = "${WORKDIR}/XRes" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..92dd4c82c4 --- /dev/null +++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X screen saver extension library." +SECTION = "libs" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext xextproto scrnsaverproto" +PROVIDES = "libxss" +RREPLACES = "libxss" + +XORG_PN = "libXScrnSaver" + +include xorg-xlibs.inc + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb new file mode 100644 index 0000000000..af064f5b4d --- /dev/null +++ b/packages/xorg-lib/libxss_cvs.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" + +PV = "0.0+cvs${SRCDATE}" +PR = "r2" + +SECTION = "libs" +DEPENDS = "libx11 libxext" +DESCRIPTION = "X screen saver extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" +S = "${WORKDIR}/Xss" + +inherit autotools pkgconfig + +#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxt/.mtn2git_empty b/packages/xorg-lib/libxt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxt/autofoo.patch b/packages/xorg-lib/libxt/autofoo.patch new file mode 100644 index 0000000000..ff6dfdbbcc --- /dev/null +++ b/packages/xorg-lib/libxt/autofoo.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400 ++++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500 +@@ -28,11 +28,11 @@ + dnl + dnl + AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt) ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + + # Check for progs + AC_PROG_CC diff --git a/packages/xorg-lib/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb new file mode 100644 index 0000000000..00cbe9a3ad --- /dev/null +++ b/packages/xorg-lib/libxt_0.1.5.bb @@ -0,0 +1,29 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Phil Blundell " +DEPENDS = "libx11 libsm" +PROVIDES = "xt" +DESCRIPTION = "X Toolkit Intrinsics" +LICENSE = "X-MIT" +PR = "r1" +SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXt-${PV}" + +PARALLEL_MAKE = "" + +inherit autotools pkgconfig + +#nasty hack as utils need to be native +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs + ) + oe_runmake +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..606de5f31c --- /dev/null +++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "X Toolkit Intrinsics" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libsm util-macros kbproto" +PROVIDES = "xt" + +XORG_PN = "libXt" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) + oe_runmake +} diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..69c74343a4 --- /dev/null +++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "X Toolkit Intrinsics" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "X-MIT" + +DEPENDS = "libx11 libsm util-macros" +PROVIDES = "xt" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXt" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + ) + oe_runmake +} diff --git a/packages/xorg-lib/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb new file mode 100644 index 0000000000..fdabe1d90f --- /dev/null +++ b/packages/xorg-lib/libxt_cvs.bb @@ -0,0 +1,26 @@ +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libx11 libsm" +PROVIDES = "xt" +DESCRIPTION = "X Toolkit Intrinsics" +LICENSE = "X-MIT" +PR = "r1" +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt" +S = "${WORKDIR}/Xt" + +inherit autotools pkgconfig + + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs + ) + oe_runmake +} + + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..1355142ffd --- /dev/null +++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Test Extension: client side library" +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext recordproto xextproto inputproto" +PROVIDES = "xtst" + +XORG_PN = "libXtst" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb new file mode 100644 index 0000000000..c7c24d5d74 --- /dev/null +++ b/packages/xorg-lib/libxtst_cvs.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +PV = "0.0+cvs${SRCDATE}" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "libx11 recordext libxext" +PROVIDES = "xtst" +DESCRIPTION = "X Test Extension: client side library" +PR = "r3" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst" +S = "${WORKDIR}/Xtst" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb new file mode 100644 index 0000000000..e70ce9cee9 --- /dev/null +++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "libx11 libxext" +DESCRIPTION = "X Video extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" +S = "${WORKDIR}/Xv" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb new file mode 100644 index 0000000000..49e9670120 --- /dev/null +++ b/packages/xorg-lib/libxv_2.2.2.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/libs" +DEPENDS = "libx11 libxext" +DESCRIPTION = "X Video extension library." + +SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" +S = "${WORKDIR}/libXv-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..2d5c6aeb17 --- /dev/null +++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X Video extension library." +SECTION = "x11/libs" +#MAINTAINER = "" +LICENSE = "GPL" + +DEPENDS = "libx11 libxext xextproto videoproto" + +XORG_PN = "libXv" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" diff --git a/packages/xorg-lib/libxvmc/.mtn2git_empty b/packages/xorg-lib/libxvmc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-lib/libxvmc/drm.patch b/packages/xorg-lib/libxvmc/drm.patch new file mode 100644 index 0000000000..d48cdb3d0b --- /dev/null +++ b/packages/xorg-lib/libxvmc/drm.patch @@ -0,0 +1,9 @@ +--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000 ++++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000 +@@ -1,5 +1,5 @@ + AM_CFLAGS = $(XVMC_CFLAGS) +-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm ++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm + + lib_LTLIBRARIES = libviaXvMC.la + diff --git a/packages/xorg-lib/libxvmc/true.patch b/packages/xorg-lib/libxvmc/true.patch new file mode 100644 index 0000000000..7059295007 --- /dev/null +++ b/packages/xorg-lib/libxvmc/true.patch @@ -0,0 +1,11 @@ +--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100 ++++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100 +@@ -43,6 +43,8 @@ + #include + #include + #include "vldXvMC.h" ++ ++#define TRUE 1 + + #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \ + (((CARD8 *)(ctx)->sAreaAddress) + \ diff --git a/packages/xorg-lib/libxvmc/via.patch b/packages/xorg-lib/libxvmc/via.patch new file mode 100644 index 0000000000..21cdfbdd6b --- /dev/null +++ b/packages/xorg-lib/libxvmc/via.patch @@ -0,0 +1,23 @@ +--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100 ++++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100 +@@ -14,4 +14,5 @@ + AC_OUTPUT([Makefile + hw/Makefile + hw/i810/Makefile ++ hw/via/Makefile + xvmc.pc]) +--- /dev/null 2004-06-13 02:32:19.000000000 +0100 ++++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100 +@@ -0,0 +1,7 @@ ++AM_CFLAGS = $(XVMC_CFLAGS) ++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm ++ ++lib_LTLIBRARIES = libviaXvMC.la ++ ++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \ ++ viaXvMCPriv.h +--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100 ++++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100 +@@ -1 +1 @@ +-SUBDIRS = i810 ++SUBDIRS = i810 via diff --git a/packages/xorg-lib/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb new file mode 100644 index 0000000000..b70c9f52e4 --- /dev/null +++ b/packages/xorg-lib/libxvmc_20040919.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \ + file://via.patch;patch=1 \ + file://true.patch" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_configure_prepend() { + install -d ${S}/hw/via + cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/ + ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch ) +} + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/packages/xorg-lib/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb new file mode 100644 index 0000000000..829a74d92b --- /dev/null +++ b/packages/xorg-lib/libxvmc_20041025.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" +PR = "r2" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + file://true.patch;patch=1 file://drm.patch;patch=1" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_install() { + oe_runmake DESTDIR='${D}' install + oe_runmake -C hw/via DESTDIR='${D}' install +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/packages/xorg-lib/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb new file mode 100644 index 0000000000..18cd369acc --- /dev/null +++ b/packages/xorg-lib/libxvmc_20050612.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "X Video Motion Compensation extension library." +SECTION = "x11/libs" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" +PR = "r0" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ + ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \ + file://true.patch;patch=1 file://drm.patch;patch=1" +S = "${WORKDIR}/XvMC" + +CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE" + +# this one is for via only atm. +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit autotools pkgconfig + +do_compile() { + oe_runmake + oe_runmake -C hw/via +} + +do_install() { + oe_runmake DESTDIR='${D}' install + oe_runmake -C hw/via DESTDIR='${D}' install +} + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DATADIR}/man + oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR} + install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/ +} diff --git a/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..82e784789f --- /dev/null +++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Xxf86dga extension library." +SECTION = "x11/libs" +LICENSE = "XFree86" + +DEPENDS = "libx11 libxext xf86dgaproto" + +XORG_PN = "libXxf86dga" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..2842c2c458 --- /dev/null +++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Xxf86dga extension library." +SECTION = "x11/libs" +LICENSE = "XFree86" + +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86dga" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb new file mode 100644 index 0000000000..96acce5d0e --- /dev/null +++ b/packages/xorg-lib/libxxf86dga_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "XFree86" + +SECTION = "x11/libs" +DEPENDS = "libx11 libxext xxf86dgaext" +DESCRIPTION = "Xxf86dga extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" +S = "${WORKDIR}/Xxf86dga" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR} +} diff --git a/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..5d5badb7a1 --- /dev/null +++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" +DEPENDS = "libx11 libxext xf86miscproto" + +XORG_PN = "libXxf86misc" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..2544f91ab1 --- /dev/null +++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86misc" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..47a319c28e --- /dev/null +++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext xf86vidmodeproto" + +XORG_PN = "libXxf86vm" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb new file mode 100644 index 0000000000..0ab206a0df --- /dev/null +++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xxf86vm extension library." +SECTION = "x11/libs" +LICENSE = "MIT" + +DEPENDS = "libx11 libxext" + +XORG_RELEASE = "X11R7.1" +XORG_PN = "libXxf86vm" + +include xorg-xlibs.inc + +EXTRA_OECONF="--enable-malloc0returnsnull" + diff --git a/packages/xorg-lib/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb new file mode 100644 index 0000000000..5eb48f930d --- /dev/null +++ b/packages/xorg-lib/libxxf86vm_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" + +SECTION = "x11/libs" +DEPENDS = "libx11 libxext xxf86vmext" +DESCRIPTION = "Xxf86vm extension library." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" +S = "${WORKDIR}/Xxf86vm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc new file mode 100644 index 0000000000..8fb46777b0 --- /dev/null +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -0,0 +1,12 @@ +XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}" +XORG_RELEASE ?= "X11R7.0" + +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" + + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/xtrans-native_0.1.bb b/packages/xorg-lib/xtrans-native_0.1.bb new file mode 100644 index 0000000000..80de95c869 --- /dev/null +++ b/packages/xorg-lib/xtrans-native_0.1.bb @@ -0,0 +1,3 @@ +SECTION = "x11/base" +include xtrans_${PV}.bb +inherit native diff --git a/packages/xorg-lib/xtrans_0.1.bb b/packages/xorg-lib/xtrans_0.1.bb new file mode 100644 index 0000000000..8fee0d5089 --- /dev/null +++ b/packages/xorg-lib/xtrans_0.1.bb @@ -0,0 +1,15 @@ +SECTION = "x11/libs" +LICENSE = "MIT" +MAINTAINER = "Greg Gilbert " +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2" +S = "${WORKDIR}/libXtrans-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb new file mode 100644 index 0000000000..b6933bf615 --- /dev/null +++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -0,0 +1,9 @@ +LICENSE = "MIT" +SECTION = "x11/libs" +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +XORG_PN = "${PN}" + +include xorg-xlibs.inc diff --git a/packages/xorg-lib/xtrans_cvs.bb b/packages/xorg-lib/xtrans_cvs.bb new file mode 100644 index 0000000000..9714f4017b --- /dev/null +++ b/packages/xorg-lib/xtrans_cvs.bb @@ -0,0 +1,16 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE = "MIT" +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert " +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans" +S = "${WORKDIR}/xtrans" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-proto/.mtn2git_empty b/packages/xorg-proto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb new file mode 100644 index 0000000000..0989abb63c --- /dev/null +++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "compositeext" diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb new file mode 100644 index 0000000000..bb55a2022e --- /dev/null +++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb @@ -0,0 +1,3 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" +CONFLICTS = "compositeext" diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..cde80f0ffa --- /dev/null +++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "damageext" diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb new file mode 100644 index 0000000000..2be69994a8 --- /dev/null +++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "fixesext" diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb new file mode 100644 index 0000000000..8e552e6bc5 --- /dev/null +++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb @@ -0,0 +1,3 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" +CONFLICTS = "fixesext" diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..fafe3d3bef --- /dev/null +++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "randrext" diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb new file mode 100644 index 0000000000..9e2cafceb8 --- /dev/null +++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "recordext" diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb new file mode 100644 index 0000000000..7f9febd8fa --- /dev/null +++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "renderext" diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..e210b894ee --- /dev/null +++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "resourceext" diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb new file mode 100644 index 0000000000..1ae2522d5f --- /dev/null +++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +PROVIDES = "xextensions" diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb new file mode 100644 index 0000000000..3d7166c741 --- /dev/null +++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "xxf86dgaext" diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb new file mode 100644 index 0000000000..9ce9a207b8 --- /dev/null +++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb @@ -0,0 +1,3 @@ +include proto-common.inc + +CONFLICTS = "xxf86vmext" diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc new file mode 100644 index 0000000000..65dfd4207a --- /dev/null +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "X protocol headers" +SECTION = "x11/libs" +LICENSE= "MIT-X" +#MAINTAINER = "" + +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2" + +S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}" + +XORG_RELEASE ?= "X11R7.0" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xorg-proto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb new file mode 100644 index 0000000000..44ccb5f035 --- /dev/null +++ b/packages/xorg-proto/xproto-native_6.6.2.bb @@ -0,0 +1,4 @@ +SECTION = "unknown" +include xproto_${PV}.bb +inherit native +PROVIDES = "" diff --git a/packages/xorg-proto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb new file mode 100644 index 0000000000..7b768a8079 --- /dev/null +++ b/packages/xorg-proto/xproto-native_cvs.bb @@ -0,0 +1,4 @@ +SECTION = "unknown" +include xproto_cvs.bb +inherit native +PROVIDES = "" diff --git a/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb new file mode 100644 index 0000000000..594a351155 --- /dev/null +++ b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb @@ -0,0 +1,13 @@ +LICENSE= "MIT" +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert " +DESCRIPTION = "X protocol and ancillary headers." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226" +S = "${WORKDIR}/Xproto" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-proto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb new file mode 100644 index 0000000000..b5cf751053 --- /dev/null +++ b/packages/xorg-proto/xproto_6.6.2.bb @@ -0,0 +1,13 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +MAINTAINER = "Greg Gilbert " +DESCRIPTION = "X protocol and ancillary headers." + +SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz" +S = "${WORKDIR}/xproto-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb new file mode 100644 index 0000000000..67c086e764 --- /dev/null +++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb @@ -0,0 +1,2 @@ +include proto-common.inc +XORG_RELEASE = "X11R7.1" diff --git a/packages/xorg-proto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb new file mode 100644 index 0000000000..1d9c96c87d --- /dev/null +++ b/packages/xorg-proto/xproto_cvs.bb @@ -0,0 +1,15 @@ +PV = "0.0+cvs${SRCDATE}" +LICENSE= "MIT" +SECTION = "x11/libs" +MAINTAINER = "Greg Gilbert " +DESCRIPTION = "X protocol and ancillary headers." + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto" +S = "${WORKDIR}/Xproto" + +inherit autotools pkgconfig + + +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb new file mode 100644 index 0000000000..66419fe87f --- /dev/null +++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb @@ -0,0 +1 @@ +include proto-common.inc diff --git a/packages/xorg-util/.mtn2git_empty b/packages/xorg-util/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb new file mode 100644 index 0000000000..6b009a7ea7 --- /dev/null +++ b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +XORG_PN = "${PN}" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2" diff --git a/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb new file mode 100644 index 0000000000..76101b0345 --- /dev/null +++ b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +#MAINTAINER = "" + +XORG_PN = "${PN}" +XORG_RELEASE = "X11R7.1" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2" diff --git a/packages/xorg-xserver/.mtn2git_empty b/packages/xorg-xserver/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/files/calibrate_zaurusd.patch b/packages/xorg-xserver/files/calibrate_zaurusd.patch new file mode 100644 index 0000000000..6a7e3b02b7 --- /dev/null +++ b/packages/xorg-xserver/files/calibrate_zaurusd.patch @@ -0,0 +1,12 @@ +--- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200 ++++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200 +@@ -2,4 +2,9 @@ + + if [ ! -f /etc/pointercal ]; then + /usr/bin/run-calibrate.sh ++ ++ if [ -x /etc/init.d/zaurusd ]; then ++ /etc/init.d/zaurusd stop ++ /etc/init.d/zaurusd start ++ fi + fi diff --git a/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch new file mode 100644 index 0000000000..73cf3f6ffb --- /dev/null +++ b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch @@ -0,0 +1,42 @@ +diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap +--- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200 ++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200 +@@ -9,6 +9,9 @@ + "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") + xmodmap - < /etc/X11/slcXXXX.xmodmap + ;; ++ "SHARP Poodle") ++ xmodmap - < /etc/X11/poodle.xmodmap ++ ;; + "Sharp-Collie") + xmodmap - < /etc/X11/collie.xmodmap + ;; +diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap +--- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100 ++++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200 +@@ -0,0 +1,25 @@ ++keycode 37 = Control_L ++keycode 64 = Alt_L ++ ++ ++keycode 50 = Shift_L ++keycode 62 = Shift_R ++keycode 75 = Mode_switch ++ ++ ++ ++clear control ++clear shift ++clear lock ++clear mod4 ++clear mod1 ++ ++add control = Control_L ++add shift = Shift_L Shift_R ++add lock = Caps_Lock ++ ++! This is AltGr ++add mod4 = Mode_switch ++ ++add mod1 = Alt_L ++ diff --git a/packages/xorg-xserver/files/setDPI.sh b/packages/xorg-xserver/files/setDPI.sh new file mode 100644 index 0000000000..04a2edd6c6 --- /dev/null +++ b/packages/xorg-xserver/files/setDPI.sh @@ -0,0 +1,92 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: setDPI.sh +# Date: 09-Apr-06 + +# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size +# setting of 7 can be used on all machines. + + +XDEFAULTS="/etc/X11/Xdefaults" + + + +set_dpi() { + + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" + + if test "$CURRENT_SETTING" != "$1" + then + echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" + + if grep -q "Xft.dpi" "$XDEFAULTS" + then + cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" + mv "${XDEFAULTS}_" "${XDEFAULTS}" + else + echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" + fi + else + echo "Your $SCREEN_DPI DPI screen is already configured." + fi +} + +set_rxvt_font() { + + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" + + if test "$1" -gt 100 + then + + # Configure the rxvt font-size for your screen here: + test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 + + if test -z "$RXVT_FONT_SIZE" + then + echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" + echo "Defaulting to size 9" + RXVT_FONT_SIZE=9 + fi + + if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" + then + echo "Using a rxvt font-size of $RXVT_FONT_SIZE" + cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ + mv ${XDEFAULTS}_ ${XDEFAULTS} + else + echo "The rxvt font-size is already configured" + fi + fi +} + +if test -z "$DISPLAY" +then + echo "DISPLAY is not set, aborting..." + exit 0 +fi + +SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" + +if test -z "$SCREEN_DPI" +then + echo "WARNING: Couldn't read your screens DPI, defaulting to 100" + SCREEN_DPI=100 +fi + +# Configure your screen here: +test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 +test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 + + +if test -z "$SET_SCREEN_DPI" +then + echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" + echo "Using 100 DPI" + SET_SCREEN_DPI=100 +fi + +set_dpi "$SET_SCREEN_DPI" +set_rxvt_font "$SCREEN_DPI" diff --git a/packages/xorg-xserver/xserver-common_1.10.bb b/packages/xorg-xserver/xserver-common_1.10.bb new file mode 100644 index 0000000000..de81537f99 --- /dev/null +++ b/packages/xorg-xserver/xserver-common_1.10.bb @@ -0,0 +1,19 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1 \ + file://poodle-xmodmap-2.6.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xorg-xserver/xserver-common_1.3.bb b/packages/xorg-xserver/xserver-common_1.3.bb new file mode 100644 index 0000000000..ea3fab6654 --- /dev/null +++ b/packages/xorg-xserver/xserver-common_1.3.bb @@ -0,0 +1,12 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + diff --git a/packages/xorg-xserver/xserver-common_1.8.bb b/packages/xorg-xserver/xserver-common_1.8.bb new file mode 100644 index 0000000000..b7b3f554f3 --- /dev/null +++ b/packages/xorg-xserver/xserver-common_1.8.bb @@ -0,0 +1,18 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r2" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xorg-xserver/xserver-common_1.9.bb b/packages/xorg-xserver/xserver-common_1.9.bb new file mode 100644 index 0000000000..de81537f99 --- /dev/null +++ b/packages/xorg-xserver/xserver-common_1.9.bb @@ -0,0 +1,19 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1 \ + file://poodle-xmodmap-2.6.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch new file mode 100644 index 0000000000..0c0b64bf14 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch @@ -0,0 +1,13 @@ +--- configure.ac~ 2005-06-03 17:23:36.000000000 +0200 ++++ configure.ac 2005-06-03 17:23:36.000000000 +0200 +@@ -447,10 +447,6 @@ + KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" + fi + +-if test "$TSLIB" = yes; then +- KDRIVE_LIBS="${KDRIVE_LIBS} -lts" +-fi +- + AC_SUBST([KDRIVE_PURE_LIBS]) + AC_SUBST([KDRIVE_PURE_INCS]) + AC_SUBST([KDRIVE_LIBS]) diff --git a/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch new file mode 100644 index 0000000000..f87e7cc2cd --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch @@ -0,0 +1,14 @@ +--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 ++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 +@@ -198,6 +198,11 @@ + return FALSE; + } + ++ /* Re-get the "fixed" parameters since they might have changed */ ++ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); ++ if (k < 0) ++ perror ("FBIOGET_FSCREENINFO"); ++ + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); + depth = priv->var.bits_per_pixel; diff --git a/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch new file mode 100644 index 0000000000..22ad51c5ad --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch @@ -0,0 +1,19 @@ +Index: hw/kdrive/src/kmode.c +=================================================================== +RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v +retrieving revision 1.13 +diff -u -r1.13 kmode.c +--- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13 ++++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000 +@@ -41,6 +41,11 @@ + 1, 11, 14, KdSyncNegative, + }, + ++ { 240, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ + /* Other VESA modes */ + { 640, 350, 85, 31500, /* VESA */ + 32, 96, 192, KdSyncPositive, /* 26.413 */ diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb new file mode 100644 index 0000000000..31bcb0c273 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb @@ -0,0 +1,23 @@ +LICENSE = "MIT" +DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +PROVIDES = "virtual/xserver" +PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices" + +PR = "r2" + +FILES_${PN} = "${bindir}/Xomap" + +SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \ + file://kmode.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://configure-tslib.patch;patch=1;pnum=0" + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ + --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr" diff --git a/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff new file mode 100644 index 0000000000..596e498b80 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff @@ -0,0 +1,464 @@ +--- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100 +@@ -79,7 +79,7 @@ + # tslib touchscreen driver + AC_CHECK_HEADERS([tslib.h]) + +-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau" ++REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau" + + DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi" + DEFAULT_VENDOR_STRING="freedesktop.org" +--- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100 +@@ -79,7 +79,6 @@ + #endif + + #include "windowstr.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "gcstruct.h" + #include "selection.h" +--- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100 +@@ -51,7 +51,6 @@ + #include + #endif + #include "misc.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "scrnintstr.h" + #include "gcstruct.h" +--- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100 +@@ -89,7 +89,6 @@ + #include "colormap.h" + #include "colormapst.h" + #include "cursorstr.h" +-#include "font.h" + #include "opaque.h" + #include "servermd.h" + #include "site.h" +--- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100 +@@ -57,7 +57,7 @@ + #include + #include "misc.h" + #include "dixstruct.h" +-#include "fontstruct.h" ++#include "dixfont.h" + #include "scrnintstr.h" + #include "swaprep.h" + #include "globals.h" +--- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100 +@@ -31,7 +31,7 @@ + #include + #endif + #include "misc.h" +-#include "font.h" ++#include "dixfont.h" + + Bool + XpClientIsBitmapClient(ClientPtr client) +--- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100 +@@ -26,7 +26,6 @@ + #include + #endif + #include "fb.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + + Bool +--- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100 +@@ -38,7 +38,6 @@ + #include "pixmapstr.h" + #include "regionstr.h" + #include "mistruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "fb.h" + #include "migc.h" +--- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100 +@@ -51,7 +51,6 @@ + #include "pixmapstr.h" + #include "regionstr.h" + #include "mistruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "fb.h" + #include "migc.h" +--- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100 +@@ -29,7 +29,6 @@ + #endif + #include "kdrive.h" + #include "kaa.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + + #define DEBUG_MIGRATE 0 +--- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100 +@@ -27,10 +27,10 @@ + #define DIXFONT_H 1 + + #include "dix.h" +-#include "font.h" +-#include "fontconf.h" ++#include ++#include + #include "closure.h" +-#include "fontstruct.h" ++#include + + #define NullDIXFontProp ((DIXFontPropPtr)0) + +--- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100 +@@ -27,7 +27,6 @@ + + #include "servermd.h" + #include "dixfont.h" +-#include "fontstruct.h" + #include "closure.h" + #define NEED_REPLIES + #include "X11/Xproto.h" /* for xQueryFontReply */ +--- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100 +@@ -57,7 +57,6 @@ + #include "gcstruct.h" + #include "windowstr.h" + #include "pixmapstr.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "dixstruct.h" /* For requestingClient */ + #include "mi.h" +--- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100 +@@ -55,7 +55,6 @@ + #include + #include + #include "misc.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "gcstruct.h" + #include "windowstr.h" +--- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100 +@@ -54,7 +54,7 @@ + #include "validate.h" + #include "window.h" + #include "gc.h" +-#include "font.h" ++#include "dixfont.h" + #include "input.h" + #include "cursor.h" + +--- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100 +@@ -54,6 +54,8 @@ + #include "extension.h" + #include "micmap.h" + #include "xext.h" ++#include "pixmap.h" ++#include "gc.h" + + #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */ + #undef PEXEXT +--- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100 +@@ -63,7 +63,6 @@ + #include + #include "misc.h" + #include "gcstruct.h" +-#include "fontstruct.h" + #include "dixfontstr.h" + #include "mi.h" + +--- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100 +@@ -42,7 +42,6 @@ + # include "input.h" + # include "mi.h" + # include "cursorstr.h" +-# include "font.h" + # include "scrnintstr.h" + # include "colormapst.h" + # include "windowstr.h" +@@ -50,7 +49,6 @@ + # include "mipointer.h" + # include "mispritest.h" + # include "dixfontstr.h" +-# include "fontstruct.h" + #ifdef RENDER + # include "mipict.h" + #endif +--- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100 +@@ -28,9 +28,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100 +@@ -29,9 +29,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100 +@@ -29,9 +29,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100 +@@ -28,9 +28,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100 +@@ -28,9 +28,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100 +@@ -28,9 +28,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100 +@@ -28,9 +28,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100 +@@ -30,9 +30,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100 +@@ -25,9 +25,7 @@ + #include + #include "scrnintstr.h" + #include "windowstr.h" +-#include "font.h" + #include "dixfontstr.h" +-#include "fontstruct.h" + #include "mi.h" + #include "regionstr.h" + #include "globals.h" +--- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100 +@@ -27,4 +27,4 @@ + + #include "config.h" + +-#include ++#include +--- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100 +@@ -25,4 +25,4 @@ + #define XSERV_t + #define TRANS_SERVER + +-#include ++#include +--- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100 +@@ -32,27 +32,6 @@ + #include "pixmap.h" + #include "gc.h" + +-typedef struct _ShmFuncs { +- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, +- int width, +- int height, +- int depth, +- char *addr); +- void (* PutImage)(DrawablePtr dst, +- GCPtr pGC, +- int depth, +- unsigned int format, +- int w, +- int h, +- int sx, +- int sy, +- int sw, +- int sh, +- int dx, +- int dy, +- char *data); +-} ShmFuncs, *ShmFuncsPtr; +- + void + ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); + +--- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100 ++++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100 +@@ -48,7 +48,7 @@ + PERFORMANCE OF THIS SOFTWARE. + + ******************************************************************/ +-/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */ ++/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */ + + #ifndef _SYNCINT_H_ + #define _SYNCINT_H_ +@@ -57,26 +57,10 @@ + + #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */ + +-typedef struct _SyncCounter { +- ClientPtr client; /* Owning client. 0 for system counters */ +- XSyncCounter id; /* resource ID */ +- CARD64 value; /* counter value */ +- struct _SyncTriggerList *pTriglist; /* list of triggers */ +- Bool beingDestroyed; /* in process of going away */ +- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */ +-} SyncCounter; +- + /* + * The System Counter interface + */ + +-typedef enum { +- XSyncCounterNeverChanges, +- XSyncCounterNeverIncreases, +- XSyncCounterNeverDecreases, +- XSyncCounterUnrestricted +-} SyncCounterType; +- + typedef void + (*SyncQueryValueProcPtr) (pointer pCounter, + CARD64 *freshvalue); +@@ -86,16 +70,6 @@ + CARD64 *lessthan, + CARD64 *greaterthan); + +-typedef struct _SysCounterInfo { +- char *name; +- CARD64 resolution; +- CARD64 bracket_greater; +- CARD64 bracket_less; +- SyncCounterType counterType; /* how can this counter change */ +- SyncQueryValueProcPtr QueryValue; +- SyncBracketValuesProcPtr BracketValues; +-} SysCounterInfo; +- + struct _SyncTrigger; + + typedef Bool +@@ -108,55 +82,6 @@ + typedef void + (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger); + +-typedef struct _SyncTrigger { +- SyncCounter *pCounter; +- CARD64 wait_value; /* wait value */ +- unsigned int value_type; /* Absolute or Relative */ +- unsigned int test_type; /* transition or Comparision type */ +- CARD64 test_value; /* trigger event threshold value */ +- SyncCheckTriggerProcPtr CheckTrigger; +- SyncTriggerFiredProcPtr TriggerFired; +- SyncCounterDestroyedProcPtr CounterDestroyed; +-} SyncTrigger; +- +-typedef struct _SyncTriggerList { +- SyncTrigger *pTrigger; +- struct _SyncTriggerList *next; +-} SyncTriggerList; +- +-typedef struct _SyncAlarmClientList { +- ClientPtr client; +- XID delete_id; +- struct _SyncAlarmClientList *next; +-} SyncAlarmClientList; +- +-typedef struct _SyncAlarm { +- SyncTrigger trigger; +- ClientPtr client; +- XSyncAlarm alarm_id; +- CARD64 delta; +- int events; +- int state; +- SyncAlarmClientList *pEventClients; +-} SyncAlarm; +- +-typedef struct { +- ClientPtr client; +- CARD32 delete_id; +- int num_waitconditions; +-} SyncAwaitHeader; +- +-typedef struct { +- SyncTrigger trigger; +- CARD64 event_threshold; +- SyncAwaitHeader *pHeader; +-} SyncAwait; +- +-typedef union { +- SyncAwaitHeader header; +- SyncAwait await; +-} SyncAwaitUnion; +- + pointer + SyncCreateSystemCounter(char *name, + CARD64 inital_value, diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch new file mode 100644 index 0000000000..a6238126c0 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/devfs.patch @@ -0,0 +1,47 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/linux/linux.c~devfs ++++ xserver/hw/kdrive/linux/linux.c +@@ -82,10 +82,10 @@ + vtno = kdVirtualTerminal; + else + { +- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) ++ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) + { + FatalError( +- "LinuxInit: Cannot open /dev/tty0 (%s)\n", ++ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", + strerror(errno)); + } + if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || +@@ -96,7 +96,7 @@ + } + close(fd); + +- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ ++ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ + + if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) + { +@@ -113,7 +113,7 @@ + * + * Why is this needed? + */ +- LinuxCheckChown ("/dev/tty0"); ++ LinuxCheckChown ("/dev/vc/0"); + /* + * Linux doesn't switch to an active vt after the last close of a vt, + * so we do this ourselves by remembering which is active now. +@@ -453,7 +453,7 @@ + activeVT = -1; + } + close(LinuxConsoleFd); /* make the vt-manager happy */ +- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); ++ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); + if (fd >= 0) + { + memset (&vts, '\0', sizeof (vts)); /* valgrind */ diff --git a/packages/xorg-xserver/xserver-kdrive/disable-apm.patch b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch new file mode 100644 index 0000000000..bd8842721b --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch @@ -0,0 +1,20 @@ +--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000 ++++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000 +@@ -342,7 +342,7 @@ + /* + * Open the APM driver + */ +- LinuxApmFd = open ("/dev/apm_bios", 2); ++ /*LinuxApmFd = open ("/dev/apm_bios", 2); + if (LinuxApmFd < 0 && errno == ENOENT) + LinuxApmFd = open ("/dev/misc/apm_bios", 2); + if (LinuxApmFd >= 0) +@@ -352,7 +352,7 @@ + RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); + AddEnabledDevice (LinuxApmFd); + } +- ++ */ + /* + * now get the VT + */ diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch new file mode 100644 index 0000000000..9c43e52ead --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch @@ -0,0 +1,37 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -505,7 +505,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1514,7 +1526,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1534,10 +1548,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch new file mode 100644 index 0000000000..13a6c2c954 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch @@ -0,0 +1,12 @@ +--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 ++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 +@@ -52,8 +52,8 @@ + /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ + + #define NEED_REPLIES + #ifdef HAVE_DIX_CONFIG_H +-#include ++#include + #endif + + #include diff --git a/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch new file mode 100644 index 0000000000..e488657b74 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch @@ -0,0 +1,23 @@ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -1438,6 +1446,10 @@ + fi + +- # tslib... ++ AC_CHECK_HEADERS([tslib.h]) ++ if test "$ac_cv_header_tslib_h" = yes; then ++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support]) ++ fi + + # damage shadow extension glx (NOTYET) fb mi + KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' +@@ -1467,7 +1479,7 @@ + AC_SUBST(KDRIVE_CFLAGS) + AC_SUBST(KDRIVE_PURE_LIBS) + AC_SUBST(KDRIVE_LIBS) +-AM_CONDITIONAL(TSLIB, false) ++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes]) + AM_CONDITIONAL(H3600_TS, false) + AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) diff --git a/packages/xorg-xserver/xserver-kdrive/epson.patch b/packages/xorg-xserver/xserver-kdrive/epson.patch new file mode 100644 index 0000000000..07009bdc40 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/epson.patch @@ -0,0 +1,11 @@ +--- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200 ++++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100 +@@ -55,7 +55,7 @@ + { + KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); + #ifdef TOUCHSCREEN +- KdInitTouchScreen (&TsFuncs); ++ KdAddMouseDriver (&TsFuncs); + #endif + } + diff --git a/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch new file mode 100644 index 0000000000..eaf7ddec36 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch @@ -0,0 +1,241 @@ +Index: xserver/miext/shadow/shrotate.c +=================================================================== +RCS file: /scratch/openbsd/cvs/XF4/xc/programs/Xserver/miext/shadow/shrotate.c,v +retrieving revision 1.2 +diff -u -r1.2 shrotate.c +--- xserver/miext/shadow/shrotate.c 3 Nov 2004 00:09:54 -0000 1.2 ++++ xserver/miext/shadow/shrotate.c 20 Sep 2005 23:07:58 -0000 +@@ -45,6 +45,106 @@ + #define TOP_TO_BOTTOM 2 + #define BOTTOM_TO_TOP -2 + ++ ++static void ++shadowUpdateRotatePackedSubRectangle(shadowBufPtr pBuf, ++ FbBits *shaLine, int shaFirstShift, ++ int shaStepOverX, int shaStepOverY, ++ int shaStepDownX, int shaStepDownY, ++ int shaBpp, FbBits shaMask, ++ ScreenPtr pScreen, ++ int scr_x1, int scr_y, ++ int scr_h, int scr_w, ++ int pixelsPerBits) ++{ ++ FbBits *sha; ++ int shaShift; ++ int scr_x; ++ int w; ++ ++ /* ++ * Copy the bits, always write across the physical frame buffer ++ * to take advantage of write combining. ++ */ ++ while (scr_h--) ++ { ++ int p; ++ FbBits bits; ++ FbBits *win; ++ int i; ++ CARD32 winSize; ++ ++ sha = shaLine; ++ shaShift = shaFirstShift; ++ w = scr_w; ++ scr_x = scr_x1 * shaBpp >> FB_SHIFT; ++ ++ while (w) ++ { ++ /* ++ * Map some of this line ++ */ ++ win = (FbBits *) (*pBuf->window) (pScreen, ++ scr_y, ++ scr_x << 2, ++ SHADOW_WINDOW_WRITE, ++ &winSize, ++ pBuf->closure); ++ i = (winSize >> 2); ++ if (i > w) ++ i = w; ++ w -= i; ++ scr_x += i; ++ /* ++ * Copy the portion of the line mapped ++ */ ++ while (i--) ++ { ++ bits = 0; ++ p = pixelsPerBits; ++ /* ++ * Build one word of output from multiple inputs ++ */ ++ while (p--) ++ { ++ bits = FbScrLeft(bits, shaBpp); ++ bits |= FbScrRight (*sha, shaShift) & shaMask; ++ ++ shaShift -= shaStepOverX; ++ if (shaShift >= FB_UNIT) ++ { ++ shaShift -= FB_UNIT; ++ sha--; ++ } ++ else if (shaShift < 0) ++ { ++ shaShift += FB_UNIT; ++ sha++; ++ } ++ sha += shaStepOverY; ++ } ++ *win++ = bits; ++ } ++ } ++ scr_y++; ++ shaFirstShift -= shaStepDownX; ++ if (shaFirstShift >= FB_UNIT) ++ { ++ shaFirstShift -= FB_UNIT; ++ shaLine--; ++ } ++ else if (shaFirstShift < 0) ++ { ++ shaFirstShift += FB_UNIT; ++ shaLine++; ++ } ++ shaLine += shaStepDownY; ++ } ++} ++ ++#define BLOCKSIZE_HEIGHT 32 ++#define BLOCKSIZE_WIDTH 32 ++ + void + shadowUpdateRotatePacked (ScreenPtr pScreen, + shadowBufPtr pBuf) +@@ -61,7 +161,6 @@ + int sha_x1 = 0, sha_y1 = 0; + int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; + int scr_x, scr_y; +- int w; + int pixelsPerBits; + int pixelsMask; + FbStride shaStepOverY = 0, shaStepDownY = 0; +@@ -221,86 +320,46 @@ + ((sha_x1 * shaBpp) >> FB_SHIFT)); + + /* +- * Copy the bits, always write across the physical frame buffer +- * to take advantage of write combining. ++ * Copy in blocks of size BLOCKSIZE_WIDTH x BLOCKSIZE_HEIGHT ++ * to reduce the number of cache misses when rotating 90 or ++ * 270 degrees. + */ +- while (scr_h--) ++ for (scr_y = scr_y1; scr_y < scr_y2; scr_y += BLOCKSIZE_HEIGHT) + { +- int p; +- FbBits bits; +- FbBits *win; +- int i; +- CARD32 winSize; +- + sha = shaLine; + shaShift = shaFirstShift; +- w = scr_w; +- scr_x = scr_x1 * shaBpp >> FB_SHIFT; + +- while (w) ++ for (scr_x = scr_x1; scr_x < scr_x2; scr_x += BLOCKSIZE_WIDTH) + { +- /* +- * Map some of this line +- */ +- win = (FbBits *) (*pBuf->window) (pScreen, +- scr_y, +- scr_x << 2, +- SHADOW_WINDOW_WRITE, +- &winSize, +- pBuf->closure); +- i = (winSize >> 2); +- if (i > w) +- i = w; +- w -= i; +- scr_x += i; +- /* +- * Copy the portion of the line mapped +- */ +- while (i--) +- { +- bits = 0; +- p = pixelsPerBits; +- /* +- * Build one word of output from multiple inputs +- * +- * Note that for 90/270 rotations, this will walk +- * down the shadow hitting each scanline once. +- * This is probably not very efficient. +- */ +- while (p--) +- { +- bits = FbScrLeft(bits, shaBpp); +- bits |= FbScrRight (*sha, shaShift) & shaMask; ++ int h = BLOCKSIZE_HEIGHT; ++ int w = BLOCKSIZE_WIDTH; + +- shaShift -= shaStepOverX; +- if (shaShift >= FB_UNIT) +- { +- shaShift -= FB_UNIT; +- sha--; +- } +- else if (shaShift < 0) +- { +- shaShift += FB_UNIT; +- sha++; +- } +- sha += shaStepOverY; +- } +- *win++ = bits; +- } +- } +- scr_y++; +- shaFirstShift -= shaStepDownX; +- if (shaFirstShift >= FB_UNIT) +- { +- shaFirstShift -= FB_UNIT; +- shaLine--; +- } +- else if (shaFirstShift < 0) +- { +- shaFirstShift += FB_UNIT; +- shaLine++; ++ if (scr_y + h > scr_y2) ++ h = scr_y2 - scr_y; ++ if (scr_x + w > scr_x2) ++ w = scr_x2 - scr_x; ++ w = (w * shaBpp) >> FB_SHIFT; ++ ++ shadowUpdateRotatePackedSubRectangle ++ (pBuf, ++ sha, shaShift, ++ shaStepOverX, shaStepOverY, ++ shaStepDownX, shaStepDownY, ++ shaBpp, shaMask, ++ pScreen, ++ scr_x, scr_y, ++ h, w, ++ pixelsPerBits); ++ ++ shaShift -= BLOCKSIZE_WIDTH * shaStepOverX; ++ sha += BLOCKSIZE_WIDTH * shaStepOverY; ++ sha -= (shaShift >> FB_SHIFT); ++ shaShift &= FB_MASK; + } +- shaLine += shaStepDownY; ++ shaFirstShift -= BLOCKSIZE_HEIGHT * shaStepDownX; ++ shaLine += BLOCKSIZE_HEIGHT * shaStepDownY; ++ shaLine -= (shaFirstShift >> FB_SHIFT); ++ shaFirstShift &= FB_MASK; + } + } + } diff --git a/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch new file mode 100644 index 0000000000..f87e7cc2cd --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch @@ -0,0 +1,14 @@ +--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 ++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 +@@ -198,6 +198,11 @@ + return FALSE; + } + ++ /* Re-get the "fixed" parameters since they might have changed */ ++ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); ++ if (k < 0) ++ perror ("FBIOGET_FSCREENINFO"); ++ + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); + depth = priv->var.bits_per_pixel; diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch new file mode 100644 index 0000000000..2dc22bf50e --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch @@ -0,0 +1,515 @@ +# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at +# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html +diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c +--- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200 ++++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200 +@@ -31,9 +31,11 @@ + #include + #include + #include ++#include + #include "inputstr.h" + #include "scrnintstr.h" + #include "kdrive.h" ++#include "kkeymap.h" + + #define NUM_EVENTS 128 + #define ABS_UNSET -65535 +@@ -105,9 +107,10 @@ + { + KdMouseInfo *mi = closure; + Kevdev *ke = mi->driver; +- int i; ++ int i, j; + struct input_event events[NUM_EVENTS]; + int n; ++ int flags; + + n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event)); + if (n <= 0) +@@ -115,22 +118,64 @@ + n /= sizeof (struct input_event); + for (i = 0; i < n; i++) + { ++ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState; + switch (events[i].type) { + case EV_SYN: + break; + case EV_KEY: +- EvdevMotion (mi); +- ASSIGNBIT(ke->key,events[i].code, events[i].value); +- if (events[i].code < 0x100) +- ErrorF ("key %d %d\n", events[i].code, events[i].value); +- else +- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value); ++ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) { ++ switch (events[i].code) { ++ case BTN_LEFT: ++ if (events[i].value == 1) ++ flags |= KD_BUTTON_1; ++ else ++ flags &= ~KD_BUTTON_1; ++ break; ++ case BTN_MIDDLE: ++ if (events[i].value == 1) ++ flags |= KD_BUTTON_2; ++ else ++ flags &= ~KD_BUTTON_2; ++ break; ++ case BTN_RIGHT: ++ if (events[i].value == 1) ++ flags |= KD_BUTTON_3; ++ else ++ flags &= ~KD_BUTTON_3; ++ break; ++ default: ++ /* Unknow button */ ++ break; ++ } ++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); ++ } + break; + case EV_REL: +- ke->rel[events[i].code] += events[i].value; ++ if (events[i].code == REL_X) { ++ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0); ++ } ++ else if (events[i].code == REL_Y) { ++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value); ++ } ++ else if (events[i].code == REL_WHEEL) { ++ for (j = 0; j < abs (events[i].value); j++) { ++ if (events[i].value > 0) ++ flags |= KD_BUTTON_4; ++ else ++ flags |= KD_BUTTON_5; ++ ++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); ++ ++ if (events[i].value > 0) ++ flags &= ~KD_BUTTON_4; ++ else ++ flags &= ~KD_BUTTON_5; ++ ++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); ++ } /* events[i].code == REL_WHEEL */ ++ } + break; + case EV_ABS: +- ke->abs[events[i].code] = events[i].value; + break; + } + } +@@ -173,6 +218,12 @@ + fd = open (kdefaultEvdev[i], 2); + if (fd >= 0) + { ++ if (ioctl (fd, EVIOCGRAB, 1) < 0) ++ { ++ close (fd); ++ continue; ++ } ++ + mi->name = KdSaveString (kdefaultEvdev[i]); + break; + } +@@ -287,7 +338,319 @@ + EvdevFini, + }; + +-#if 0 ++/* Keyboard */ ++ ++int kbd_fd = -1; ++int EvdevInputType = 0; ++ ++KeySym evdevKeymap[(194 - 1 + 1) * 2] = { ++/* These are directly mapped from DOS scanset 0 */ ++/* 1 8 */ XK_Escape, NoSymbol, ++/* 2 9 */ XK_1, XK_exclam, ++/* 3 10 */ XK_2, XK_at, ++/* 4 11 */ XK_3, XK_numbersign, ++/* 5 12 */ XK_4, XK_dollar, ++/* 6 13 */ XK_5, XK_percent, ++/* 7 14 */ XK_6, XK_asciicircum, ++/* 8 15 */ XK_7, XK_ampersand, ++/* 9 16 */ XK_8, XK_asterisk, ++/* 10 17 */ XK_9, XK_parenleft, ++/* 11 18 */ XK_0, XK_parenright, ++/* 12 19 */ XK_minus, XK_underscore, ++/* 13 20 */ XK_equal, XK_plus, ++/* 14 21 */ XK_BackSpace, NoSymbol, ++/* 15 22 */ XK_Tab, NoSymbol, ++/* 16 23 */ XK_Q, NoSymbol, ++/* 17 24 */ XK_W, NoSymbol, ++/* 18 25 */ XK_E, NoSymbol, ++/* 19 26 */ XK_R, NoSymbol, ++/* 20 27 */ XK_T, NoSymbol, ++/* 21 28 */ XK_Y, NoSymbol, ++/* 22 29 */ XK_U, NoSymbol, ++/* 23 30 */ XK_I, NoSymbol, ++/* 24 31 */ XK_O, NoSymbol, ++/* 25 32 */ XK_P, NoSymbol, ++/* 26 33 */ XK_bracketleft, XK_braceleft, ++/* 27 34 */ XK_bracketright, XK_braceright, ++/* 28 35 */ XK_Return, NoSymbol, ++/* 29 36 */ XK_Control_L, NoSymbol, ++/* 30 37 */ XK_A, NoSymbol, ++/* 31 38 */ XK_S, NoSymbol, ++/* 32 39 */ XK_D, NoSymbol, ++/* 33 40 */ XK_F, NoSymbol, ++/* 34 41 */ XK_G, NoSymbol, ++/* 35 42 */ XK_H, NoSymbol, ++/* 36 43 */ XK_J, NoSymbol, ++/* 37 44 */ XK_K, NoSymbol, ++/* 38 45 */ XK_L, NoSymbol, ++/* 39 46 */ XK_semicolon, XK_colon, ++/* 40 47 */ XK_apostrophe, XK_quotedbl, ++/* 41 48 */ XK_grave, XK_asciitilde, ++/* 42 49 */ XK_Shift_L, NoSymbol, ++/* 43 50 */ XK_backslash, XK_bar, ++/* 44 51 */ XK_Z, NoSymbol, ++/* 45 52 */ XK_X, NoSymbol, ++/* 46 53 */ XK_C, NoSymbol, ++/* 47 54 */ XK_V, NoSymbol, ++/* 48 55 */ XK_B, NoSymbol, ++/* 49 56 */ XK_N, NoSymbol, ++/* 50 57 */ XK_M, NoSymbol, ++/* 51 58 */ XK_comma, XK_less, ++/* 52 59 */ XK_period, XK_greater, ++/* 53 60 */ XK_slash, XK_question, ++/* 54 61 */ XK_Shift_R, NoSymbol, ++/* 55 62 */ XK_KP_Multiply, NoSymbol, ++/* 56 63 */ XK_Alt_L, XK_Meta_L, ++/* 57 64 */ XK_space, NoSymbol, ++/* 58 65 */ XK_Caps_Lock, NoSymbol, ++/* 59 66 */ XK_F1, NoSymbol, ++/* 60 67 */ XK_F2, NoSymbol, ++/* 61 68 */ XK_F3, NoSymbol, ++/* 62 69 */ XK_F4, NoSymbol, ++/* 63 70 */ XK_F5, NoSymbol, ++/* 64 71 */ XK_F6, NoSymbol, ++/* 65 72 */ XK_F7, NoSymbol, ++/* 66 73 */ XK_F8, NoSymbol, ++/* 67 74 */ XK_F9, NoSymbol, ++/* 68 75 */ XK_F10, NoSymbol, ++/* 69 76 */ XK_Break, XK_Pause, ++/* 70 77 */ XK_Scroll_Lock, NoSymbol, ++/* 71 78 */ XK_KP_Home, XK_KP_7, ++/* 72 79 */ XK_KP_Up, XK_KP_8, ++/* 73 80 */ XK_KP_Page_Up, XK_KP_9, ++/* 74 81 */ XK_KP_Subtract, NoSymbol, ++/* 75 82 */ XK_KP_Left, XK_KP_4, ++/* 76 83 */ XK_KP_5, NoSymbol, ++/* 77 84 */ XK_KP_Right, XK_KP_6, ++/* 78 85 */ XK_KP_Add, NoSymbol, ++/* 79 86 */ XK_KP_End, XK_KP_1, ++/* 80 87 */ XK_KP_Down, XK_KP_2, ++/* 81 88 */ XK_KP_Page_Down, XK_KP_3, ++/* 82 89 */ XK_KP_Insert, XK_KP_0, ++/* 83 90 */ XK_KP_Delete, XK_KP_Decimal, ++/* 84 91 */ NoSymbol, NoSymbol, ++/* 85 92 */ NoSymbol, NoSymbol, ++/* 86 93 */ NoSymbol, NoSymbol, ++/* 87 94 */ XK_F11, NoSymbol, ++/* 88 95 */ XK_F12, NoSymbol, ++ ++/* These are remapped from the extended set (using ExtendMap) */ ++ ++/* 89 96 */ XK_Control_R, NoSymbol, ++/* 90 97 */ XK_KP_Enter, NoSymbol, ++/* 91 98 */ XK_KP_Divide, NoSymbol, ++/* 92 99 */ XK_Sys_Req, XK_Print, ++/* 93 100 */ XK_Alt_R, XK_Meta_R, ++/* 94 101 */ XK_Num_Lock, NoSymbol, ++/* 95 102 */ XK_Home, NoSymbol, ++/* 96 103 */ XK_Up, NoSymbol, ++/* 97 104 */ XK_Page_Up, NoSymbol, ++/* 98 105 */ XK_Left, NoSymbol, ++/* 99 106 */ XK_Right, NoSymbol, ++/* 100 107 */ XK_End, NoSymbol, ++/* 101 108 */ XK_Down, NoSymbol, ++/* 102 109 */ XK_Page_Down, NoSymbol, ++/* 103 110 */ XK_Insert, NoSymbol, ++/* 104 111 */ XK_Delete, NoSymbol, ++/* 105 112 */ XK_Super_L, NoSymbol, ++/* 106 113 */ XK_Super_R, NoSymbol, ++/* 107 114 */ XK_Menu, NoSymbol, ++/* 108 115 */ NoSymbol, NoSymbol, ++/* 109 116 */ NoSymbol, NoSymbol, ++/* 110 117 */ NoSymbol, NoSymbol, ++/* 111 118 */ NoSymbol, NoSymbol, ++/* 112 119 */ NoSymbol, NoSymbol, ++ ++/* 113 120 */ NoSymbol, NoSymbol, ++/* 114 121 */ NoSymbol, NoSymbol, ++/* 115 122 */ NoSymbol, NoSymbol, ++/* 116 123 */ NoSymbol, NoSymbol, ++/* 117 124 */ NoSymbol, NoSymbol, ++/* 118 125 */ NoSymbol, NoSymbol, ++/* 119 126 */ NoSymbol, NoSymbol, ++/* 120 127 */ NoSymbol, NoSymbol, ++/* 121 128 */ NoSymbol, NoSymbol, ++/* 122 129 */ NoSymbol, NoSymbol, ++/* 123 130 */ NoSymbol, NoSymbol, ++/* 124 131 */ NoSymbol, NoSymbol, ++/* 125 132 */ NoSymbol, NoSymbol, ++/* 126 133 */ NoSymbol, NoSymbol, ++/* 127 134 */ NoSymbol, NoSymbol, ++/* 128 135 */ NoSymbol, NoSymbol, ++/* 129 136 */ NoSymbol, NoSymbol, ++/* 130 137 */ NoSymbol, NoSymbol, ++/* 131 138 */ NoSymbol, NoSymbol, ++/* 132 139 */ NoSymbol, NoSymbol, ++/* 133 140 */ NoSymbol, NoSymbol, ++/* 134 141 */ NoSymbol, NoSymbol, ++/* 135 142 */ NoSymbol, NoSymbol, ++/* 136 143 */ NoSymbol, NoSymbol, ++/* 137 144 */ NoSymbol, NoSymbol, ++/* 138 145 */ NoSymbol, NoSymbol, ++/* 139 146 */ NoSymbol, NoSymbol, ++/* 140 147 */ NoSymbol, NoSymbol, ++/* 141 148 */ NoSymbol, NoSymbol, ++/* 142 149 */ NoSymbol, NoSymbol, ++/* 143 150 */ NoSymbol, NoSymbol, ++/* 144 151 */ NoSymbol, NoSymbol, ++/* 145 152 */ NoSymbol, NoSymbol, ++/* 146 153 */ NoSymbol, NoSymbol, ++/* 147 154 */ NoSymbol, NoSymbol, ++/* 148 155 */ NoSymbol, NoSymbol, ++/* 149 156 */ NoSymbol, NoSymbol, ++/* 150 157 */ NoSymbol, NoSymbol, ++/* 151 158 */ NoSymbol, NoSymbol, ++/* 152 159 */ NoSymbol, NoSymbol, ++/* 153 160 */ NoSymbol, NoSymbol, ++/* 154 161 */ NoSymbol, NoSymbol, ++/* 155 162 */ NoSymbol, NoSymbol, ++/* 156 163 */ NoSymbol, NoSymbol, ++/* 157 164 */ NoSymbol, NoSymbol, ++/* 158 165 */ NoSymbol, NoSymbol, ++/* 159 166 */ NoSymbol, NoSymbol, ++/* 160 167 */ NoSymbol, NoSymbol, ++/* 161 168 */ NoSymbol, NoSymbol, ++/* 162 169 */ NoSymbol, NoSymbol, ++/* 163 170 */ NoSymbol, NoSymbol, ++/* 164 171 */ NoSymbol, NoSymbol, ++/* 165 172 */ NoSymbol, NoSymbol, ++/* 166 173 */ NoSymbol, NoSymbol, ++/* 167 174 */ NoSymbol, NoSymbol, ++/* 168 175 */ NoSymbol, NoSymbol, ++/* 169 176 */ NoSymbol, NoSymbol, ++/* 170 177 */ NoSymbol, NoSymbol, ++/* 171 178 */ NoSymbol, NoSymbol, ++/* 172 179 */ NoSymbol, NoSymbol, ++/* 173 180 */ NoSymbol, NoSymbol, ++/* 174 181 */ NoSymbol, NoSymbol, ++/* 175 182 */ NoSymbol, NoSymbol, ++/* 176 183 */ NoSymbol, NoSymbol, ++/* 177 184 */ NoSymbol, NoSymbol, ++/* 178 185 */ NoSymbol, NoSymbol, ++/* 179 186 */ NoSymbol, NoSymbol, ++/* 180 187 */ NoSymbol, NoSymbol, ++/* 181 188 */ NoSymbol, NoSymbol, ++/* 182 189 */ NoSymbol, NoSymbol, ++/* 183 190 */ NoSymbol, NoSymbol, ++/* 184 191 */ NoSymbol, NoSymbol, ++/* 185 192 */ NoSymbol, NoSymbol, ++/* 186 193 */ NoSymbol, NoSymbol, ++/* 187 194 */ NoSymbol, NoSymbol, ++/* 188 195 */ NoSymbol, NoSymbol, ++/* 189 196 */ NoSymbol, NoSymbol, ++/* 190 197 */ NoSymbol, NoSymbol, ++/* 191 198 */ NoSymbol, NoSymbol, ++/* 192 199 */ NoSymbol, NoSymbol, ++/* 193 200 */ NoSymbol, NoSymbol, ++/* 194 201 */ NoSymbol, NoSymbol, ++}; ++ ++static void ++EvdevKbdRead (int fd, void *closure) ++{ ++ int i, n; ++ struct input_event events[NUM_EVENTS]; ++ ++ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event)); ++ if (n <= 0) ++ return; ++ ++ n /= sizeof (struct input_event); ++ ++ for (i = 0; i < n; i++) ++ { ++ if (events[i].type == EV_KEY) ++ KdEnqueueKeyboardEvent (events[i].code, !events[i].value); ++ } ++} ++ ++static void ++EvdevKbdLoad (void) ++{ ++ kdMinScanCode = 0; ++ kdMaxScanCode = 193; ++ kdKeymapWidth = 2; ++ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap)); ++} ++ ++static int ++EvdevKbdInit (void) ++{ ++ int fd, i; ++ ++ if (!EvdevInputType) ++ EvdevInputType = KdAllocInputType (); ++ ++ if (!kdKeyboard) ++ { ++ for (i = 0; i < NUM_DEFAULT_EVDEV; i++) ++ { ++ fd = open (kdefaultEvdev[i], 2); ++ if (fd >= 0) ++ { ++ kdKeyboard = KdSaveString (kdefaultEvdev[i]); ++ break; ++ } ++ } ++ } ++ else ++ { ++ fd = open (kdKeyboard, O_RDWR); ++ if (fd < 0) ++ return FALSE; ++ } ++ ++ if (ioctl (fd, EVIOCGRAB, 1) < 0) ++ { ++ close (fd); ++ return FALSE; ++ } ++ ++ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL)) ++ return FALSE; ++ ++ kbd_fd = fd; ++ return TRUE; ++} ++ ++static void ++EvdevKbdFini (void) ++{ ++} ++ ++static void ++EvdevKbdLeds (int leds) ++{ ++ struct input_event event; ++ ++ memset(&event, 0, sizeof(event)); ++ ++ event.type = EV_LED; ++ event.code = LED_CAPSL; ++ event.value = leds & (1 << 0) ? 1 : 0; ++ write(kbd_fd, (char *) &event, sizeof(event)); ++ ++ event.type = EV_LED; ++ event.code = LED_NUML; ++ event.value = leds & (1 << 1) ? 1 : 0; ++ write(kbd_fd, (char *) &event, sizeof(event)); ++ ++ event.type = EV_LED; ++ event.code = LED_SCROLLL; ++ event.value = leds & (1 << 2) ? 1 : 0; ++ write(kbd_fd, (char *) &event, sizeof(event)); ++ ++ event.type = EV_LED; ++ event.code = LED_COMPOSE; ++ event.value = leds & (1 << 3) ? 1 : 0; ++ write(kbd_fd, (char *) &event, sizeof(event)); ++} ++ ++static void ++EvdevKbdBell (int volume, int frequency, int duration) ++{ ++} ++ + KdKeyboardFuncs LinuxEvdevKeyboardFuncs = { + EvdevKbdLoad, + EvdevKbdInit, +@@ -296,4 +659,4 @@ + EvdevKbdFini, + 0, + }; +-#endif ++ +diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c +--- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200 ++++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200 +@@ -73,6 +73,7 @@ + Bool kdEnabled; + int kdSubpixelOrder; + int kdVirtualTerminal = -1; ++char *kdKeyboard = 0; + Bool kdSwitchPending; + char *kdSwitchCmd; + DDXPointRec kdOrigin; +@@ -795,6 +796,14 @@ + UseMsg (); + return 2; + } ++ if (!strcmp (argv[i], "-keyboard")) ++ { ++ if ((i+1) < argc) ++ kdKeyboard = argv[i+1]; ++ else ++ UseMsg (); ++ return 2; ++ } + if (!strcmp (argv[i], "-rgba")) + { + if ((i+1) < argc) +diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h +--- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200 ++++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200 +@@ -416,6 +416,7 @@ + extern Bool kdDisableZaphod; + extern Bool kdDontZap; + extern int kdVirtualTerminal; ++extern char *kdKeyboard; + extern char *kdSwitchCmd; + extern KdOsFuncs *kdOsFuncs; + +@@ -769,7 +770,7 @@ + ProcessInputEvents (void); + + extern KdMouseFuncs LinuxMouseFuncs; +-extern KdMouseFuncs LinuxEvdevFuncs; ++extern KdMouseFuncs LinuxEvdevMouseFuncs; + extern KdMouseFuncs Ps2MouseFuncs; + extern KdMouseFuncs BusMouseFuncs; + extern KdMouseFuncs MsMouseFuncs; +@@ -777,6 +778,7 @@ + extern KdMouseFuncs TsFuncs; + #endif + extern KdKeyboardFuncs LinuxKeyboardFuncs; ++extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs; + extern KdOsFuncs LinuxFuncs; + + extern KdMouseFuncs VxWorksMouseFuncs; +diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c +--- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200 ++++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200 +@@ -1300,6 +1300,7 @@ + xE.u.u.type = KeyPress; + xE.u.u.detail = key_code; + ++#ifndef XKB + switch (KEYCOL1(key_code)) + { + case XK_Num_Lock: +@@ -1313,6 +1314,7 @@ + else + xE.u.u.type = KeyPress; + } ++#endif + + /* + * Check pressed keys which are already down diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch new file mode 100644 index 0000000000..d4f885ee26 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch @@ -0,0 +1,53 @@ +--- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100 ++++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100 +@@ -28,6 +28,8 @@ + #endif + #include + ++extern int use_evdev; ++ + void + InitCard (char *name) + { +@@ -45,7 +47,10 @@ + void + InitInput (int argc, char **argv) + { +- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); ++ if (use_evdev) ++ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs); ++ else ++ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); + #ifdef TOUCHSCREEN + KdAddMouseDriver (&TsFuncs); + #endif +--- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100 ++++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100 +@@ -44,6 +44,8 @@ + #include "dpmsproc.h" + #endif + ++int use_evdev = 0; ++ + typedef struct _kdDepths { + CARD8 depth; + CARD8 bpp; +@@ -687,6 +689,7 @@ + ErrorF("-videoTest Start the server, pause momentarily and exit\n"); + ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n"); + ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n"); ++ ErrorF("-use-evdev Use Linux evdev input\n"); + ErrorF("-switchCmd Command to execute on vt switch\n"); + ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n"); + ErrorF("vtxx Use virtual terminal xx instead of the next available\n"); +@@ -796,6 +799,10 @@ + UseMsg (); + return 2; + } ++ if (!strcmp (argv[i], "-use-evdev")) ++ { ++ use_evdev = 1; ++ } + if (!strcmp (argv[i], "-keyboard")) + { + if ((i+1) < argc) diff --git a/packages/xorg-xserver/xserver-kdrive/kmode.patch b/packages/xorg-xserver/xserver-kdrive/kmode.patch new file mode 100644 index 0000000000..5ad3e4e277 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/kmode.patch @@ -0,0 +1,28 @@ +--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200 ++++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200 +@@ -41,6 +41,11 @@ + 1, 11, 14, KdSyncNegative, + }, + ++ { 240, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ + /* Other VESA modes */ + { 640, 350, 85, 31500, /* VESA */ + 32, 96, 192, KdSyncPositive, /* 26.413 */ +@@ -80,6 +85,13 @@ + 16, 48, 160, KdSyncNegative, /* 31.469 */ + 10, 33, 45, KdSyncNegative, /* 59.940 */ + }, ++ ++ ++ { 480, 640, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ 0, 0, 0, KdSyncNegative, /* 59.940 */ ++ }, ++ + + /* 800x600 modes */ + { 800, 600, 85, 56250, /* VESA */ diff --git a/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch new file mode 100644 index 0000000000..35ccadaa8d --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch @@ -0,0 +1,13 @@ +--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 ++++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 +@@ -927,8 +927,10 @@ char *kdefaultMouse[] = { + "/dev/psaux", + "/dev/input/mice", + "/dev/adbmouse", ++#ifdef BREAK_MY_SERIAL_CONSOLE + "/dev/ttyS0", + "/dev/ttyS1", ++#endif + }; + + #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0])) diff --git a/packages/xorg-xserver/xserver-kdrive/onlyfb.patch b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch new file mode 100644 index 0000000000..e773324981 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/Makefile.am~onlyfb ++++ xserver/hw/kdrive/Makefile.am +@@ -17,12 +17,4 @@ + SUBDIRS = \ + src \ + linux \ +- $(XSDL_SUBDIRS) \ +- $(FBDEV_SUBDIRS) \ +- $(VESA_SUBDIRS) \ +- $(XEPHYR_SUBDIRS) \ +- ati \ +- fake \ +- ephyr \ +- i810 \ +- epson ++ $(FBDEV_SUBDIRS) diff --git a/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch new file mode 100644 index 0000000000..d9ef51c5ba --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch @@ -0,0 +1,54 @@ +--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200 ++++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200 +@@ -35,6 +35,10 @@ + XINPUT_DIR=Xi + endif + ++if XKB ++XKB_DIR=xkb ++endif ++ + if DBE + DBE_DIR=dbe + endif +@@ -51,7 +55,7 @@ + randr \ + render \ + $(XINPUT_DIR) \ +- xkb \ ++ $(XKB_DIR) \ + $(DBE_DIR) \ + $(MFB_DIR) \ + $(AFB_DIR) \ +--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 ++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 +@@ -418,6 +418,7 @@ + AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) + AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes]) + AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) ++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) + + dnl DDXes. + AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) +@@ -739,12 +740,15 @@ + + AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) + +-AC_DEFINE(XKB, 1, [Build XKB]) +-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) +-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) +-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +-XKB_LIB='$(top_builddir)/xkb/libxkb.la' +-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) ++if test "x$XKB" = xyes; then ++ AC_DEFINE(XKB, 1, [Build XKB]) ++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) ++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" ++ XKB_LIB='$(top_builddir)/xkb/libxkb.la' ++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' ++fi + + AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, + [Do not have `strcasecmp'.])) diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch new file mode 100644 index 0000000000..3f8cd4ea5c --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch @@ -0,0 +1,351 @@ +--- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200 +@@ -385,6 +385,9 @@ + #ifdef DMXEXT + extern void DMXExtensionInit(INITARGS); + #endif ++#ifdef XCALIBRATE ++extern void XCalibrateExtensionInit(INITARGS); ++#endif + #ifdef XEVIE + extern void XevieExtensionInit(INITARGS); + #endif +@@ -679,6 +682,9 @@ + #ifdef DAMAGE + if (!noDamageExtension) DamageExtensionInit(); + #endif ++#ifdef XCALIBRATE ++ XCalibrateExtensionInit (); ++#endif + } + + void +--- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200 +@@ -407,6 +407,7 @@ + AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes]) + AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes]) + AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes]) ++AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes]) + AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes]) + AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no]) + AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes]) +@@ -641,6 +642,12 @@ + AC_DEFINE(XCSECURITY, 1, [Build Security extension]) + fi + ++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) ++if test "x$XCALIBRATE" = xyes; then ++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" ++fi ++ + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) + if test "x$XEVIE" = xyes; then + AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) +@@ -1466,7 +1473,7 @@ + KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' + KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) +--- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200 +@@ -22,4 +22,7 @@ + /* Support tslib touchscreen abstraction library */ + #undef TSLIB + ++/* Enable XCalibrate extension */ ++#undef XCALIBRATE ++ + #endif /* _KDRIVE_CONFIG_H_ */ +--- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200 +@@ -78,6 +78,11 @@ + AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" + endif + ++XCALIBRATE_SRCS = xcalibrate.c ++if XCALIBRATE ++BUILTIN_SRCS += $(XCALIBRATE_SRCS) ++endif ++ + # X EVent Interception Extension: allows accessibility helpers & composite + # managers to intercept events from input devices and transform as needed + # before the clients see them. +@@ -155,6 +160,7 @@ + $(SCREENSAVER_SRCS) \ + $(XCSECURITY_SRCS) \ + $(XINERAMA_SRCS) \ ++ $(XCALIBRATE_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) \ +--- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200 +@@ -0,0 +1,262 @@ ++/* ++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ ++ * ++ * Copyright © 2003 Philip Blundell ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Philip Blundell not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Philip Blundell makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_KDRIVE_CONFIG_H ++#include ++#endif ++ ++#define NEED_EVENTS ++#define NEED_REPLIES ++ ++#include ++#include ++#include "misc.h" ++#include "os.h" ++#include "dixstruct.h" ++#include "extnsionst.h" ++#include "swaprep.h" ++ ++#include ++#include ++ ++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); ++extern void *tslib_raw_event_closure; ++ ++static CARD8 XCalibrateReqCode; ++int XCalibrateEventBase; ++int XCalibrateReqBase; ++int XCalibrateErrorBase; ++ ++static ClientPtr xcalibrate_client; ++ ++static void ++xcalibrate_event_hook (int x, int y, int pressure, void *closure) ++{ ++ ClientPtr pClient = (ClientPtr) closure; ++ xXCalibrateRawTouchscreenEvent ev; ++ ++ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; ++ ev.sequenceNumber = pClient->sequence; ++ ev.x = x; ++ ev.y = y; ++ ev.pressure = pressure; ++ ++ if (!pClient->clientGone) ++ WriteEventsToClient (pClient, 1, (xEvent *) &ev); ++} ++ ++static int ++ProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ xXCalibrateQueryVersionReply rep; ++ CARD16 client_major, client_minor; /* not used */ ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ ++ client_major = stuff->majorVersion; ++ client_minor = stuff->minorVersion; ++ ++ fprintf(stderr, "%s(): called\n", __func__); ++ ++ rep.type = X_Reply; ++ rep.length = 0; ++ rep.sequenceNumber = client->sequence; ++ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; ++ rep.minorVersion = XCALIBRATE_MINOR_VERSION; ++ if (client->swapped) { ++ int n; ++ swaps(&rep.sequenceNumber, n); ++ swapl(&rep.length, n); ++ swaps(&rep.majorVersion, n); ++ swaps(&rep.minorVersion, n); ++ } ++ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); ++ return (client->noClientException); ++} ++ ++static int ++SProcXCalibrateQueryVersion (ClientPtr client) ++{ ++ REQUEST(xXCalibrateQueryVersionReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); ++ swaps(&stuff->majorVersion,n); ++ swaps(&stuff->minorVersion,n); ++ return ProcXCalibrateQueryVersion(client); ++} ++ ++static int ++ProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ xXCalibrateRawModeReply rep; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ memset (&rep, 0, sizeof (rep)); ++ rep.type = X_Reply; ++ rep.sequenceNumber = client->sequence; ++ ++ if (stuff->on) ++ { ++ if (xcalibrate_client == NULL) ++ { ++ /* Start calibrating. */ ++ xcalibrate_client = client; ++ tslib_raw_event_hook = xcalibrate_event_hook; ++ tslib_raw_event_closure = client; ++ rep.status = GrabSuccess; ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ else ++ { ++ if (xcalibrate_client == client) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ rep.status = GrabSuccess; ++ ++ /* Cycle input off and on to reload configuration. */ ++ KdDisableInput (); ++ KdEnableInput (); ++ } ++ else ++ { ++ rep.status = AlreadyGrabbed; ++ } ++ } ++ ++ if (client->swapped) ++ { ++ int n; ++ ++ swaps (&rep.sequenceNumber, n); ++ swaps (&rep.status, n); ++ } ++ WriteToClient(client, sizeof (rep), (char *) &rep); ++ return (client->noClientException); ++} ++ ++ ++static int ++SProcXCalibrateSetRawMode (ClientPtr client) ++{ ++ REQUEST(xXCalibrateRawModeReq); ++ int n; ++ ++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); ++ ++ swaps(&stuff->on, n); ++ ++ return ProcXCalibrateSetRawMode(client); ++} ++ ++static void ++XCalibrateResetProc (ExtensionEntry *extEntry) ++{ ++} ++ ++static int ++ProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return ProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return ProcXCalibrateSetRawMode(client); ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static int ++SProcXCalibrateDispatch (ClientPtr client) ++{ ++ REQUEST(xReq); ++ int n; ++ ++ swaps(&stuff->length,n); ++ ++ switch (stuff->data) { ++ case X_XCalibrateQueryVersion: ++ return SProcXCalibrateQueryVersion(client); ++ case X_XCalibrateRawMode: ++ return SProcXCalibrateSetRawMode(client); ++ ++ default: break; ++ } ++ ++ return BadRequest; ++} ++ ++static void ++XCalibrateClientCallback (CallbackListPtr *list, ++ pointer closure, ++ pointer data) ++{ ++ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ++ ClientPtr pClient = clientinfo->client; ++ ++ if (clientinfo->setup == NULL ++ && xcalibrate_client != NULL ++ && xcalibrate_client == pClient) ++ { ++ /* Stop calibrating. */ ++ xcalibrate_client = NULL; ++ tslib_raw_event_hook = NULL; ++ tslib_raw_event_closure = NULL; ++ } ++} ++ ++void ++XCalibrateExtensionInit(void) ++{ ++ ExtensionEntry *extEntry; ++ ++ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) ++ return; ++ ++ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, ++ ProcXCalibrateDispatch, SProcXCalibrateDispatch, ++ XCalibrateResetProc, StandardMinorOpcode); ++ ++ if (!extEntry) ++ return; ++ ++ XCalibrateReqCode = (unsigned char)extEntry->base; ++ XCalibrateEventBase = extEntry->eventBase; ++ XCalibrateErrorBase = extEntry->errorBase; ++ ++ xcalibrate_client = 0; ++} diff --git a/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch new file mode 100644 index 0000000000..ce80a7e389 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch @@ -0,0 +1,44 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch ++++ xserver/hw/kdrive/fbdev/fbdev.c +@@ -190,6 +190,7 @@ + var.nonstd = 0; + var.grayscale = 0; + ++ /* commented out for poodle + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); + + if (k < 0) +@@ -198,10 +199,11 @@ + return FALSE; + } + +- /* Re-get the "fixed" parameters since they might have changed */ ++ // Re-get the "fixed" parameters since they might have changed + k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); + if (k < 0) + perror ("FBIOGET_FSCREENINFO"); ++ */ + + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); +@@ -659,13 +661,14 @@ + priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL; + + /* display it on the LCD */ ++ /* commented out for poodle + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var); + if (k < 0) + { + perror ("FBIOPUT_VSCREENINFO"); + return FALSE; + } +- ++ */ + if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR) + { + struct fb_cmap cmap; diff --git a/packages/xorg-xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb new file mode 100644 index 0000000000..21529a69d9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb @@ -0,0 +1,74 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +DEFAULT_PREFERENCE = "1" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" + +# Uncomment the following DEPENDS line and the commented line in SRC_URI +# to make this snapshot build against X11R7.0 xlibs. +#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "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" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +PR = "r11" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ +# file://build-20050207-against-X11R7.diff;patch=1 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 " + +SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ + file://kmode.patch;patch=1 \ + file://faster-rotated.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 " + + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ + file://faster-rotated.patch;patch=1 \ + file://devfs.patch;patch=1" +SRC_URI_append_collie = " file://faster-rotated.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \ + file://faster-rotated.patch;patch=1" +SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1" +SRC_URI_append_akita = " file://faster-rotated.patch;patch=1" + +PACKAGE_ARCH_mnci = "mnci" +PACKAGE_ARCH_collie = "collie" +PACKAGE_ARCH_poodle = "poodle" +PACKAGE_ARCH_h3600 = "h3600" +PACKAGE_ARCH_spitz = "spitz" +PACKAGE_ARCH_akita = "akita" + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +LDFLAGS += " -lXfont -lXdmcp -lXau " +EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama" diff --git a/packages/xorg-xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb new file mode 100644 index 0000000000..c2e44f7837 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_20050624.bb @@ -0,0 +1,49 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "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" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +PR = "r12" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ + file://kmode.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb new file mode 100644 index 0000000000..e5101a3579 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb @@ -0,0 +1,52 @@ +PV = "0.0+cvs${FIXEDSRCDATE}" +FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" +DEFAULT_PREFERENCE = "1" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "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" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +PR = "r11" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb new file mode 100644 index 0000000000..103185289c --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -0,0 +1,45 @@ +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb new file mode 100644 index 0000000000..1c841cabf7 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb @@ -0,0 +1,51 @@ +PV = "0.0+cvs${SRCDATE}" +DEFAULT_PREFERENCE = "-2" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "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" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" +DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" +DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" +DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" +DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +PR = "r11" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" +FILES_xserver-kdrive-via = "${bindir}/Xvia" +FILES_xserver-kdrive-mga = "${bindir}/Xmga" +FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-i810 = "${bindir}/Xi810" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/xserver" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb new file mode 100644 index 0000000000..1f42cc159c --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -0,0 +1,47 @@ +PV = "0.0+git" +DEFAULT_PREFERENCE = "-2" + +LICENSE = "MIT" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PROVIDES = "virtual/xserver" +RPROVIDES = "virtual/xserver" +PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +SECTION = "x11/base" +DESCRIPTION = "X server from freedesktop.org" +DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" +DESCRIPTION_xserver-kdrive-fake = "Fake X server" +DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" + +FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" +FILES_xserver-kdrive-fake = "${bindir}/Xfake" +FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" + +SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ + file://kmode.patch;patch=1 \ + file://disable-apm.patch;patch=1 \ + file://no-serial-probing.patch;patch=1 \ + file://kdrive-evdev.patch;patch=1 \ + file://kdrive-use-evdev.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ + file://optional-xkb.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://enable-tslib.patch;patch=1" + +SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +PACKAGE_ARCH_poodle = "poodle" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-composite --enable-kdrive \ + --disable-dga --disable-dri --disable-xinerama \ + --disable-xf86misc --disable-xf86vidmode \ + --disable-xorg --disable-xorgcfg \ + --disable-xkb --disable-xnest --disable-xvfb \ + --disable-xevie --disable-xprint --disable-xtrap \ + --with-default-font-path=built-ins \ + ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xorg-xserver/xserver-xorg/dri.patch b/packages/xorg-xserver/xserver-xorg/dri.patch new file mode 100644 index 0000000000..37d0407fe4 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/dri.patch @@ -0,0 +1,10 @@ +--- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100 ++++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100 +@@ -38,7 +38,6 @@ + #define _DRM_H_ + + #if defined(__linux__) +-#include + #include /* For _IO* macros */ + #define DRM_IOCTL_NR(n) _IOC_NR(n) + #define DRM_IOC_VOID _IOC_NONE diff --git a/packages/xorg-xserver/xserver-xorg/fontfile.patch b/packages/xorg-xserver/xserver-xorg/fontfile.patch new file mode 100644 index 0000000000..ed39bf45d0 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/fontfile.patch @@ -0,0 +1,11 @@ +--- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100 ++++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100 +@@ -14,7 +14,7 @@ + #endif + + INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \ +- -I$(INCLUDESRC) ++ -I$(INCLUDESRC) $(CC_STAGING) + HEADERS = + #ifdef FontFormatDefines + FORMAT_DEFS = FontFormatDefines diff --git a/packages/xorg-xserver/xserver-xorg/freetype.patch b/packages/xorg-xserver/xserver-xorg/freetype.patch new file mode 100644 index 0000000000..0ba3dd5627 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/freetype.patch @@ -0,0 +1,22 @@ +--- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100 ++++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100 +@@ -20,7 +20,7 @@ + + INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ + -I$(SERVERSRC)/include $(EXTRAINCLUDES) \ +- -I$(INCLUDESRC) ++ -I$(INCLUDESRC) $(CC_STAGING) + + SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c + OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o +--- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100 +@@ -3371,7 +3371,7 @@ + + #if BuildFreetype2Library || HasFreetype2 + #if Freetype2IncDirStandard +-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config ++FREETYPE2INCLUDES = `pkg-config --cflags freetype2` + #else + FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + #endif diff --git a/packages/xorg-xserver/xserver-xorg/imake-installed.patch b/packages/xorg-xserver/xserver-xorg/imake-installed.patch new file mode 100644 index 0000000000..57821075ef --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/imake-installed.patch @@ -0,0 +1,11 @@ +--- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100 +@@ -2058,7 +2058,7 @@ + * INCLUDES contains client-specific includes set in Imakefile + * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile + */ +- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) ++ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) diff --git a/packages/xorg-xserver/xserver-xorg/imake-staging.patch b/packages/xorg-xserver/xserver-xorg/imake-staging.patch new file mode 100644 index 0000000000..bf2e350830 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/imake-staging.patch @@ -0,0 +1,38 @@ +--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 +@@ -2038,11 +2038,11 @@ + */ + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = LdPreLib $(INSTALLED_LIBS) + LDPOSTLIB = LdPostLib +- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) ++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) +--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 ++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 +@@ -114,7 +114,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif +--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 +@@ -3359,7 +3359,7 @@ + FREETYPE2LIBDIR = Freetype2LibDir + FREETYPE2INCDIR = Freetype2IncDir + #if Freetype2LibDirStandard +-FREETYPE2LIB = -lfreetype ++FREETYPE2LIB = $(LD_STAGING) -lfreetype + #else + FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype + #endif diff --git a/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb new file mode 100644 index 0000000000..37546fe1ee --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb @@ -0,0 +1,65 @@ +SECTION = "x11/base" +RPROVIDES = "virtual/xserver" +PROVIDES = "virtual/xserver" +LICENSE = "Xorg" +PR = "r2" + +DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \ + file://imake-staging.patch;patch=1 \ + file://imake-installed.patch;patch=1 \ + file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ + file://dri.patch;patch=1" + +PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" + +S = "${WORKDIR}/xc" + +FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" +FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" +FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" +FILES_${PN}-doc += "${libdir}/X11/doc" + +do_configure() { + cat < config/cf/host.def +#define BuildServersOnly YES +#define ProjectRoot ${prefix} +#define XnestServer NO +#define XdmxServer NO +#define CcCmd gcc +#define LdCmd ld +#define HasFreetype2 YES +#define HasFontconfig YES +#define BuildDevelDRIDrivers YES +#define BuildXF86DRI YES +EOF + echo "" > config/cf/date.def + rm -f include/extensions/panoramiX.h + make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake + make CC="${BUILD_CC}" xmakefile + make Makefiles + make clean +} + +do_compile() { + #make depend + make includes + make -C config/util CC="${BUILD_CC}" + for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done + make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" +} + +do_install() { + make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install + make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install +} + +do_stage() { + install -d ${STAGING_INCDIR}/xserver-xorg + for i in i810 via; do + pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd + done + install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ +} diff --git a/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb new file mode 100644 index 0000000000..e60f62ef57 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb @@ -0,0 +1,65 @@ +SECTION = "x11/base" +RPROVIDES = "virtual/xserver" +PROVIDES = "virtual/xserver" +LICENSE = "Xorg" +PR = "r0" + +DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \ + file://imake-staging.patch;patch=1 \ + file://imake-installed.patch;patch=1 \ + file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ + file://dri.patch;patch=1" + +PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" + +S = "${WORKDIR}/xc" + +FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" +FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" +FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" +FILES_${PN}-doc += "${libdir}/X11/doc" + +do_configure() { + cat < config/cf/host.def +#define BuildServersOnly YES +#define ProjectRoot ${prefix} +#define XnestServer NO +#define XdmxServer NO +#define CcCmd gcc +#define LdCmd ld +#define HasFreetype2 YES +#define HasFontconfig YES +#define BuildDevelDRIDrivers YES +#define BuildXF86DRI YES +EOF + echo "" > config/cf/date.def + rm -f include/extensions/panoramiX.h + make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake + make CC="${BUILD_CC}" xmakefile + make Makefiles + make clean +} + +do_compile() { + #make depend + make includes + make -C config/util CC="${BUILD_CC}" + for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done + make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" +} + +do_install() { + make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install + make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install +} + +do_stage() { + install -d ${STAGING_INCDIR}/xserver-xorg + for i in i810 via; do + pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd + done + install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ +} diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb new file mode 100644 index 0000000000..e410581e17 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_cvs.bb @@ -0,0 +1,61 @@ +SECTION = "x11/base" +LICENSE = "Xorg" +RPROVIDES = "virtual/xserver" +PROVIDES = "virtual/xserver" +PR = "r3" +PV = "6.8.1+cvs${SRCDATE}" + +DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native" + +SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \ + file://imake-staging.patch;patch=1 \ + file://dri.patch;patch=1" + +PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" + +S = "${WORKDIR}/xc" + +FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print" +FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" +FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" +FILES_${PN}-doc += "${libdir}/X11/doc" + +do_configure() { + echo "#define BuildServersOnly YES" > config/cf/host.def + echo "#define ProjectRoot /usr" >> config/cf/host.def + echo "#define XnestServer NO" >> config/cf/host.def + echo "#define XdmxServer NO" >> config/cf/host.def + echo "#define CcCmd ${CC}" >> config/cf/host.def + echo "#define LdCmd ${LD}" >> config/cf/host.def + echo "#define HasFreetype2 YES" >> config/cf/host.def + echo "#define HasFontconfig YES" >> config/cf/host.def + echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def + echo "" > config/cf/date.def + rm -f include/extensions/panoramiX.h +} + +do_compile() { + make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake + make CC="${BUILD_CC}" xmakefile + make Makefiles + make clean + #make depend + make includes + make -C config/util CC="${BUILD_CC}" + for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done + make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" +} + +do_install() { + make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install + make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install +} + +do_stage() { + install -d ${STAGING_INCDIR}/xserver-xorg + for i in i810 via; do + pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd + done + install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ +} diff --git a/packages/xprop/xprop/.mtn2git_empty b/packages/xprop/xprop/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xprop/xprop/autofoo.patch b/packages/xprop/xprop/autofoo.patch deleted file mode 100644 index 2526d95087..0000000000 --- a/packages/xprop/xprop/autofoo.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -urN xprop.orig/Makefile.am xprop/Makefile.am ---- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XPROP_CFLAGS@ -+ -+bin_PROGRAMS = xprop -+ -+xprop_SOURCES = dsimple.c dsimple.h xprop.c -+ -+xprop_LDADD = @XPROP_LIBS@ -+ -+man5_MANS=xprop.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xprop.orig/configure.ac xprop/configure.ac ---- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200 -@@ -0,0 +1,44 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xprop],4.4.0,[],xprop) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XPROP, xext xmuu x11) -+ -+AC_CHECK_HEADERS([wchar.h]) -+AC_CHECK_HEADERS([wctype.h]) -+ -+AC_OUTPUT([Makefile]) -diff -urN xprop.orig/dsimple.c xprop/dsimple.c ---- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100 -+++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200 -@@ -27,11 +27,16 @@ - - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - #include - #include - #include - #include -+#include - /* - * Other_stuff.h: Definitions of routines in other_stuff. - * -@@ -69,7 +74,7 @@ - char *Malloc(size) - unsigned size; - { -- char *data, *malloc(); -+ char *data; - - if (!(data = malloc(size))) - Fatal_Error("Out of memory!"); -@@ -85,7 +90,7 @@ - char *ptr; - int size; - { -- char *new_ptr, *realloc(); -+ char *new_ptr; - - if (!ptr) - return(Malloc(size)); -diff -urN xprop.orig/xprop.c xprop/xprop.c ---- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200 -+++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200 -@@ -30,6 +30,10 @@ - /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */ - - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - #include - #include diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb deleted file mode 100644 index f6dd54b7cd..0000000000 --- a/packages/xprop/xprop_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -DEPENDS = "libx11 libxmu libxext" -DESCRIPTION = "property displayer for X" -MAINTER = "Rene Wagner " -SECTION = "x11/base" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xprop" - -inherit autotools pkgconfig diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xproto/applewmproto_1.0.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/applewmproto_1.0.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xproto/bigreqsproto_1.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/bigreqsproto_1.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xproto/compositeproto_0.2.2.bb deleted file mode 100644 index 0989abb63c..0000000000 --- a/packages/xproto/compositeproto_0.2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "compositeext" diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb deleted file mode 100644 index bb55a2022e..0000000000 --- a/packages/xproto/compositeproto_0.3.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc -XORG_RELEASE = "X11R7.1" -CONFLICTS = "compositeext" diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xproto/damageproto_1.0.3.bb deleted file mode 100644 index cde80f0ffa..0000000000 --- a/packages/xproto/damageproto_1.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "damageext" diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xproto/dmxproto_2.2.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/dmxproto_2.2.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xproto/evieext_1.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/evieext_1.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xproto/fixesproto_3.0.2.bb deleted file mode 100644 index 2be69994a8..0000000000 --- a/packages/xproto/fixesproto_3.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "fixesext" diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb deleted file mode 100644 index 8e552e6bc5..0000000000 --- a/packages/xproto/fixesproto_4.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc -XORG_RELEASE = "X11R7.1" -CONFLICTS = "fixesext" diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xproto/fontcacheproto_0.1.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/fontcacheproto_0.1.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xproto/fontsproto_2.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/fontsproto_2.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xproto/glproto_1.4.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/glproto_1.4.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb deleted file mode 100644 index 67c086e764..0000000000 --- a/packages/xproto/glproto_1.4.7.bb +++ /dev/null @@ -1,2 +0,0 @@ -include proto-common.inc -XORG_RELEASE = "X11R7.1" diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xproto/inputproto_1.3.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/inputproto_1.3.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xproto/kbproto_1.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/kbproto_1.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xproto/printproto_1.0.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/printproto_1.0.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc deleted file mode 100644 index 65dfd4207a..0000000000 --- a/packages/xproto/proto-common.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "X protocol headers" -SECTION = "x11/libs" -LICENSE= "MIT-X" -#MAINTAINER = "" - -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2" - -S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}" - -XORG_RELEASE ?= "X11R7.0" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xproto/randrproto_1.1.2.bb deleted file mode 100644 index fafe3d3bef..0000000000 --- a/packages/xproto/randrproto_1.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "randrext" diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xproto/recordproto_1.13.2.bb deleted file mode 100644 index 9e2cafceb8..0000000000 --- a/packages/xproto/recordproto_1.13.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "recordext" diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xproto/renderproto_0.9.2.bb deleted file mode 100644 index 7f9febd8fa..0000000000 --- a/packages/xproto/renderproto_0.9.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "renderext" diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xproto/resourceproto_1.0.2.bb deleted file mode 100644 index e210b894ee..0000000000 --- a/packages/xproto/resourceproto_1.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "resourceext" diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xproto/scrnsaverproto_1.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/scrnsaverproto_1.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb deleted file mode 100644 index 67c086e764..0000000000 --- a/packages/xproto/scrnsaverproto_1.1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -include proto-common.inc -XORG_RELEASE = "X11R7.1" diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xproto/trapproto_3.4.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/trapproto_3.4.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xproto/videoproto_2.2.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/videoproto_2.2.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xproto/windowswmproto_1.0.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/windowswmproto_1.0.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xproto/xcmiscproto_1.1.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xcmiscproto_1.1.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xproto/xextproto_7.0.2.bb deleted file mode 100644 index 1ae2522d5f..0000000000 --- a/packages/xproto/xextproto_7.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -PROVIDES = "xextensions" diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xproto/xf86bigfontproto_1.1.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xf86bigfontproto_1.1.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xproto/xf86dgaproto_2.0.2.bb deleted file mode 100644 index 3d7166c741..0000000000 --- a/packages/xproto/xf86dgaproto_2.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "xxf86dgaext" diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xproto/xf86driproto_2.0.3.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xf86driproto_2.0.3.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xproto/xf86miscproto_0.9.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xf86miscproto_0.9.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xproto/xf86rushproto_1.1.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xf86rushproto_1.1.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xproto/xf86vidmodeproto_2.2.2.bb deleted file mode 100644 index 9ce9a207b8..0000000000 --- a/packages/xproto/xf86vidmodeproto_2.2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -include proto-common.inc - -CONFLICTS = "xxf86vmext" diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xproto/xineramaproto_1.1.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xineramaproto_1.1.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xproto-native_6.6.2.bb b/packages/xproto/xproto-native_6.6.2.bb deleted file mode 100644 index 44ccb5f035..0000000000 --- a/packages/xproto/xproto-native_6.6.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -SECTION = "unknown" -include xproto_${PV}.bb -inherit native -PROVIDES = "" diff --git a/packages/xproto/xproto-native_cvs.bb b/packages/xproto/xproto-native_cvs.bb deleted file mode 100644 index 7b768a8079..0000000000 --- a/packages/xproto/xproto-native_cvs.bb +++ /dev/null @@ -1,4 +0,0 @@ -SECTION = "unknown" -include xproto_cvs.bb -inherit native -PROVIDES = "" diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xproto/xproto_6.6.2+cvs20050226.bb deleted file mode 100644 index 594a351155..0000000000 --- a/packages/xproto/xproto_6.6.2+cvs20050226.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE= "MIT" -SECTION = "x11/libs" -MAINTAINER = "Greg Gilbert " -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226" -S = "${WORKDIR}/Xproto" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xproto/xproto_6.6.2.bb deleted file mode 100644 index b5cf751053..0000000000 --- a/packages/xproto/xproto_6.6.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -MAINTAINER = "Greg Gilbert " -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz" -S = "${WORKDIR}/xproto-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xproto/xproto_7.0.4.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xproto_7.0.4.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb deleted file mode 100644 index 67c086e764..0000000000 --- a/packages/xproto/xproto_7.0.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -include proto-common.inc -XORG_RELEASE = "X11R7.1" diff --git a/packages/xproto/xproto_cvs.bb b/packages/xproto/xproto_cvs.bb deleted file mode 100644 index 1d9c96c87d..0000000000 --- a/packages/xproto/xproto_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "MIT" -SECTION = "x11/libs" -MAINTAINER = "Greg Gilbert " -DESCRIPTION = "X protocol and ancillary headers." - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto" -S = "${WORKDIR}/Xproto" - -inherit autotools pkgconfig - - -do_stage() { - autotools_stage_all -} diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xproto/xproxymanagementprotocol_1.0.2.bb deleted file mode 100644 index 66419fe87f..0000000000 --- a/packages/xproto/xproxymanagementprotocol_1.0.2.bb +++ /dev/null @@ -1 +0,0 @@ -include proto-common.inc diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb deleted file mode 100644 index db750c8b97..0000000000 --- a/packages/xrandr/xrandr_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE= "BSD-X" -DEPENDS = "libxrandr libx11 libxext" -DESCRIPTION = "X Resize and Rotate extension command." -SECTION = "x11/base" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools pkgconfig diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xrandr/xrandr_cvs.bb deleted file mode 100644 index 0ab7c745f4..0000000000 --- a/packages/xrandr/xrandr_cvs.bb +++ /dev/null @@ -1,10 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -DEPENDS = "libxrandr libx11 libxext" -DESCRIPTION = "X Resize and Rotate extension command." -SECTION = "x11/base" - -SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr" -S = "${WORKDIR}/xrandr" - -inherit autotools pkgconfig diff --git a/packages/xrdb/xrdb/.mtn2git_empty b/packages/xrdb/xrdb/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xrdb/xrdb/autofoo.patch b/packages/xrdb/xrdb/autofoo.patch deleted file mode 100644 index b30a46bc36..0000000000 --- a/packages/xrdb/xrdb/autofoo.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -urN xrdb.orig/Imakefile xrdb/Imakefile ---- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200 -+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,19 +0,0 @@ --XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ -- -- -- -- --XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $ -- --#ifdef PatheticCpp -- CPPDEFS = -DPATHETICCPP --#endif --#if HasMkstemp -- CPPDEFS = -DHAS_MKSTEMP --#endif --XCOMM Due to ill make parsing the cpp is passed directly in source file -- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS) -- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) --LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) -- --SimpleProgramTarget(xrdb) -diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am ---- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XRDB_CFLAGS@ -+ -+bin_PROGRAMS = xrdb -+ -+xrdb_SOURCES = xrdb.c -+ -+xrdb_LDADD = @XRDB_LIBS@ -+ -+man5_MANS=xrdb.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh ---- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200 -@@ -0,0 +1,3 @@ -+#! /bin/sh -+autoreconf -v --install || exit 1 -+./configure --enable-maintainer-mode "$@" -diff -urN xrdb.orig/configure.ac xrdb/configure.ac ---- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200 -@@ -0,0 +1,41 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xrdb],4.4.0,[],xrdb) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XRDB, xext xmuu x11) -+ -+AC_OUTPUT([Makefile]) diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb deleted file mode 100644 index 5703556a33..0000000000 --- a/packages/xrdb/xrdb_1.0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DEPENDS = "libx11 libxmu libxext" -DESCRIPTION = "X server resource database utility" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -LICENSE = "xrdb" -PR = "r0" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -inherit autotools pkgconfig diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb deleted file mode 100644 index cbf2caac70..0000000000 --- a/packages/xrdb/xrdb_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -DEPENDS = "libx11 libxmu libxext" -DESCRIPTION = "X server resource database utility" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -LICENSE = "xrdb" -PR = "r2" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xrdb" - -inherit autotools pkgconfig diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xserver-common/files/calibrate_zaurusd.patch deleted file mode 100644 index 6a7e3b02b7..0000000000 --- a/packages/xserver-common/files/calibrate_zaurusd.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200 -+++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200 -@@ -2,4 +2,9 @@ - - if [ ! -f /etc/pointercal ]; then - /usr/bin/run-calibrate.sh -+ -+ if [ -x /etc/init.d/zaurusd ]; then -+ /etc/init.d/zaurusd stop -+ /etc/init.d/zaurusd start -+ fi - fi diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xserver-common/files/poodle-xmodmap-2.6.patch deleted file mode 100644 index 73cf3f6ffb..0000000000 --- a/packages/xserver-common/files/poodle-xmodmap-2.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap ---- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200 -+++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200 -@@ -9,6 +9,9 @@ - "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") - xmodmap - < /etc/X11/slcXXXX.xmodmap - ;; -+ "SHARP Poodle") -+ xmodmap - < /etc/X11/poodle.xmodmap -+ ;; - "Sharp-Collie") - xmodmap - < /etc/X11/collie.xmodmap - ;; -diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap ---- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100 -+++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200 -@@ -0,0 +1,25 @@ -+keycode 37 = Control_L -+keycode 64 = Alt_L -+ -+ -+keycode 50 = Shift_L -+keycode 62 = Shift_R -+keycode 75 = Mode_switch -+ -+ -+ -+clear control -+clear shift -+clear lock -+clear mod4 -+clear mod1 -+ -+add control = Control_L -+add shift = Shift_L Shift_R -+add lock = Caps_Lock -+ -+! This is AltGr -+add mod4 = Mode_switch -+ -+add mod1 = Alt_L -+ diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xserver-common/files/setDPI.sh deleted file mode 100644 index 04a2edd6c6..0000000000 --- a/packages/xserver-common/files/setDPI.sh +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: setDPI.sh -# Date: 09-Apr-06 - -# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size -# setting of 7 can be used on all machines. - - -XDEFAULTS="/etc/X11/Xdefaults" - - - -set_dpi() { - - CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" - - if test "$CURRENT_SETTING" != "$1" - then - echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" - - if grep -q "Xft.dpi" "$XDEFAULTS" - then - cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" - mv "${XDEFAULTS}_" "${XDEFAULTS}" - else - echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" - fi - else - echo "Your $SCREEN_DPI DPI screen is already configured." - fi -} - -set_rxvt_font() { - - CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" - - if test "$1" -gt 100 - then - - # Configure the rxvt font-size for your screen here: - test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 - - if test -z "$RXVT_FONT_SIZE" - then - echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" - echo "Defaulting to size 9" - RXVT_FONT_SIZE=9 - fi - - if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" - then - echo "Using a rxvt font-size of $RXVT_FONT_SIZE" - cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ - mv ${XDEFAULTS}_ ${XDEFAULTS} - else - echo "The rxvt font-size is already configured" - fi - fi -} - -if test -z "$DISPLAY" -then - echo "DISPLAY is not set, aborting..." - exit 0 -fi - -SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" - -if test -z "$SCREEN_DPI" -then - echo "WARNING: Couldn't read your screens DPI, defaulting to 100" - SCREEN_DPI=100 -fi - -# Configure your screen here: -test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 -test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 - - -if test -z "$SET_SCREEN_DPI" -then - echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" - echo "Using 100 DPI" - SET_SCREEN_DPI=100 -fi - -set_dpi "$SET_SCREEN_DPI" -set_rxvt_font "$SCREEN_DPI" diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb deleted file mode 100644 index de81537f99..0000000000 --- a/packages/xserver-common/xserver-common_1.10.bb +++ /dev/null @@ -1,19 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb deleted file mode 100644 index ea3fab6654..0000000000 --- a/packages/xserver-common/xserver-common_1.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb deleted file mode 100644 index b7b3f554f3..0000000000 --- a/packages/xserver-common/xserver-common_1.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r2" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb deleted file mode 100644 index de81537f99..0000000000 --- a/packages/xserver-common/xserver-common_1.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver/.mtn2git_empty b/packages/xserver/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xserver/xserver-kdrive-omap/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xserver/xserver-kdrive-omap/configure-tslib.patch deleted file mode 100644 index 0c0b64bf14..0000000000 --- a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.ac~ 2005-06-03 17:23:36.000000000 +0200 -+++ configure.ac 2005-06-03 17:23:36.000000000 +0200 -@@ -447,10 +447,6 @@ - KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" - fi - --if test "$TSLIB" = yes; then -- KDRIVE_LIBS="${KDRIVE_LIBS} -lts" --fi -- - AC_SUBST([KDRIVE_PURE_LIBS]) - AC_SUBST([KDRIVE_PURE_INCS]) - AC_SUBST([KDRIVE_LIBS]) diff --git a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch deleted file mode 100644 index f87e7cc2cd..0000000000 --- a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 -+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 -@@ -198,6 +198,11 @@ - return FALSE; - } - -+ /* Re-get the "fixed" parameters since they might have changed */ -+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); -+ if (k < 0) -+ perror ("FBIOGET_FSCREENINFO"); -+ - /* Now get the new screeninfo */ - ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); - depth = priv->var.bits_per_pixel; diff --git a/packages/xserver/xserver-kdrive-omap/kmode.patch b/packages/xserver/xserver-kdrive-omap/kmode.patch deleted file mode 100644 index 22ad51c5ad..0000000000 --- a/packages/xserver/xserver-kdrive-omap/kmode.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: hw/kdrive/src/kmode.c -=================================================================== -RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v -retrieving revision 1.13 -diff -u -r1.13 kmode.c ---- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13 -+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000 -@@ -41,6 +41,11 @@ - 1, 11, 14, KdSyncNegative, - }, - -+ { 240, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ - /* Other VESA modes */ - { 640, 350, 85, 31500, /* VESA */ - 32, 96, 192, KdSyncPositive, /* 26.413 */ diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb deleted file mode 100644 index 31bcb0c273..0000000000 --- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" -PROVIDES = "virtual/xserver" -PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices" - -PR = "r2" - -FILES_${PN} = "${bindir}/Xomap" - -SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \ - file://kmode.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://configure-tslib.patch;patch=1;pnum=0" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \ - --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr" diff --git a/packages/xserver/xserver-kdrive/.mtn2git_empty b/packages/xserver/xserver-kdrive/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff deleted file mode 100644 index 596e498b80..0000000000 --- a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff +++ /dev/null @@ -1,464 +0,0 @@ ---- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100 -@@ -79,7 +79,7 @@ - # tslib touchscreen driver - AC_CHECK_HEADERS([tslib.h]) - --REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau" -+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau" - - DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi" - DEFAULT_VENDOR_STRING="freedesktop.org" ---- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100 -@@ -79,7 +79,6 @@ - #endif - - #include "windowstr.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "gcstruct.h" - #include "selection.h" ---- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100 -@@ -51,7 +51,6 @@ - #include - #endif - #include "misc.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "scrnintstr.h" - #include "gcstruct.h" ---- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100 -@@ -89,7 +89,6 @@ - #include "colormap.h" - #include "colormapst.h" - #include "cursorstr.h" --#include "font.h" - #include "opaque.h" - #include "servermd.h" - #include "site.h" ---- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100 -@@ -57,7 +57,7 @@ - #include - #include "misc.h" - #include "dixstruct.h" --#include "fontstruct.h" -+#include "dixfont.h" - #include "scrnintstr.h" - #include "swaprep.h" - #include "globals.h" ---- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #endif - #include "misc.h" --#include "font.h" -+#include "dixfont.h" - - Bool - XpClientIsBitmapClient(ClientPtr client) ---- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100 -@@ -26,7 +26,6 @@ - #include - #endif - #include "fb.h" --#include "fontstruct.h" - #include "dixfontstr.h" - - Bool ---- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100 -@@ -38,7 +38,6 @@ - #include "pixmapstr.h" - #include "regionstr.h" - #include "mistruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "fb.h" - #include "migc.h" ---- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100 -@@ -51,7 +51,6 @@ - #include "pixmapstr.h" - #include "regionstr.h" - #include "mistruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "fb.h" - #include "migc.h" ---- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100 -@@ -29,7 +29,6 @@ - #endif - #include "kdrive.h" - #include "kaa.h" --#include "fontstruct.h" - #include "dixfontstr.h" - - #define DEBUG_MIGRATE 0 ---- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100 -@@ -27,10 +27,10 @@ - #define DIXFONT_H 1 - - #include "dix.h" --#include "font.h" --#include "fontconf.h" -+#include -+#include - #include "closure.h" --#include "fontstruct.h" -+#include - - #define NullDIXFontProp ((DIXFontPropPtr)0) - ---- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100 -@@ -27,7 +27,6 @@ - - #include "servermd.h" - #include "dixfont.h" --#include "fontstruct.h" - #include "closure.h" - #define NEED_REPLIES - #include "X11/Xproto.h" /* for xQueryFontReply */ ---- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100 -@@ -57,7 +57,6 @@ - #include "gcstruct.h" - #include "windowstr.h" - #include "pixmapstr.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "dixstruct.h" /* For requestingClient */ - #include "mi.h" ---- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100 -@@ -55,7 +55,6 @@ - #include - #include - #include "misc.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "gcstruct.h" - #include "windowstr.h" ---- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100 -@@ -54,7 +54,7 @@ - #include "validate.h" - #include "window.h" - #include "gc.h" --#include "font.h" -+#include "dixfont.h" - #include "input.h" - #include "cursor.h" - ---- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100 -@@ -54,6 +54,8 @@ - #include "extension.h" - #include "micmap.h" - #include "xext.h" -+#include "pixmap.h" -+#include "gc.h" - - #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */ - #undef PEXEXT ---- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100 -@@ -63,7 +63,6 @@ - #include - #include "misc.h" - #include "gcstruct.h" --#include "fontstruct.h" - #include "dixfontstr.h" - #include "mi.h" - ---- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100 -@@ -42,7 +42,6 @@ - # include "input.h" - # include "mi.h" - # include "cursorstr.h" --# include "font.h" - # include "scrnintstr.h" - # include "colormapst.h" - # include "windowstr.h" -@@ -50,7 +49,6 @@ - # include "mipointer.h" - # include "mispritest.h" - # include "dixfontstr.h" --# include "fontstruct.h" - #ifdef RENDER - # include "mipict.h" - #endif ---- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100 -@@ -28,9 +28,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100 -@@ -29,9 +29,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100 -@@ -29,9 +29,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100 -@@ -28,9 +28,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100 -@@ -28,9 +28,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100 -@@ -28,9 +28,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100 -@@ -28,9 +28,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100 -@@ -30,9 +30,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100 -@@ -25,9 +25,7 @@ - #include - #include "scrnintstr.h" - #include "windowstr.h" --#include "font.h" - #include "dixfontstr.h" --#include "fontstruct.h" - #include "mi.h" - #include "regionstr.h" - #include "globals.h" ---- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100 -@@ -27,4 +27,4 @@ - - #include "config.h" - --#include -+#include ---- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100 -@@ -25,4 +25,4 @@ - #define XSERV_t - #define TRANS_SERVER - --#include -+#include ---- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100 -@@ -32,27 +32,6 @@ - #include "pixmap.h" - #include "gc.h" - --typedef struct _ShmFuncs { -- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, -- int width, -- int height, -- int depth, -- char *addr); -- void (* PutImage)(DrawablePtr dst, -- GCPtr pGC, -- int depth, -- unsigned int format, -- int w, -- int h, -- int sx, -- int sy, -- int sw, -- int sh, -- int dx, -- int dy, -- char *data); --} ShmFuncs, *ShmFuncsPtr; -- - void - ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); - ---- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100 -+++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100 -@@ -48,7 +48,7 @@ - PERFORMANCE OF THIS SOFTWARE. - - ******************************************************************/ --/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */ -+/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */ - - #ifndef _SYNCINT_H_ - #define _SYNCINT_H_ -@@ -57,26 +57,10 @@ - - #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */ - --typedef struct _SyncCounter { -- ClientPtr client; /* Owning client. 0 for system counters */ -- XSyncCounter id; /* resource ID */ -- CARD64 value; /* counter value */ -- struct _SyncTriggerList *pTriglist; /* list of triggers */ -- Bool beingDestroyed; /* in process of going away */ -- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */ --} SyncCounter; -- - /* - * The System Counter interface - */ - --typedef enum { -- XSyncCounterNeverChanges, -- XSyncCounterNeverIncreases, -- XSyncCounterNeverDecreases, -- XSyncCounterUnrestricted --} SyncCounterType; -- - typedef void - (*SyncQueryValueProcPtr) (pointer pCounter, - CARD64 *freshvalue); -@@ -86,16 +70,6 @@ - CARD64 *lessthan, - CARD64 *greaterthan); - --typedef struct _SysCounterInfo { -- char *name; -- CARD64 resolution; -- CARD64 bracket_greater; -- CARD64 bracket_less; -- SyncCounterType counterType; /* how can this counter change */ -- SyncQueryValueProcPtr QueryValue; -- SyncBracketValuesProcPtr BracketValues; --} SysCounterInfo; -- - struct _SyncTrigger; - - typedef Bool -@@ -108,55 +82,6 @@ - typedef void - (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger); - --typedef struct _SyncTrigger { -- SyncCounter *pCounter; -- CARD64 wait_value; /* wait value */ -- unsigned int value_type; /* Absolute or Relative */ -- unsigned int test_type; /* transition or Comparision type */ -- CARD64 test_value; /* trigger event threshold value */ -- SyncCheckTriggerProcPtr CheckTrigger; -- SyncTriggerFiredProcPtr TriggerFired; -- SyncCounterDestroyedProcPtr CounterDestroyed; --} SyncTrigger; -- --typedef struct _SyncTriggerList { -- SyncTrigger *pTrigger; -- struct _SyncTriggerList *next; --} SyncTriggerList; -- --typedef struct _SyncAlarmClientList { -- ClientPtr client; -- XID delete_id; -- struct _SyncAlarmClientList *next; --} SyncAlarmClientList; -- --typedef struct _SyncAlarm { -- SyncTrigger trigger; -- ClientPtr client; -- XSyncAlarm alarm_id; -- CARD64 delta; -- int events; -- int state; -- SyncAlarmClientList *pEventClients; --} SyncAlarm; -- --typedef struct { -- ClientPtr client; -- CARD32 delete_id; -- int num_waitconditions; --} SyncAwaitHeader; -- --typedef struct { -- SyncTrigger trigger; -- CARD64 event_threshold; -- SyncAwaitHeader *pHeader; --} SyncAwait; -- --typedef union { -- SyncAwaitHeader header; -- SyncAwait await; --} SyncAwaitUnion; -- - pointer - SyncCreateSystemCounter(char *name, - CARD64 inital_value, diff --git a/packages/xserver/xserver-kdrive/devfs.patch b/packages/xserver/xserver-kdrive/devfs.patch deleted file mode 100644 index a6238126c0..0000000000 --- a/packages/xserver/xserver-kdrive/devfs.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/linux/linux.c~devfs -+++ xserver/hw/kdrive/linux/linux.c -@@ -82,10 +82,10 @@ - vtno = kdVirtualTerminal; - else - { -- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) -+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) - { - FatalError( -- "LinuxInit: Cannot open /dev/tty0 (%s)\n", -+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", - strerror(errno)); - } - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || -@@ -96,7 +96,7 @@ - } - close(fd); - -- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ -+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ - - if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) - { -@@ -113,7 +113,7 @@ - * - * Why is this needed? - */ -- LinuxCheckChown ("/dev/tty0"); -+ LinuxCheckChown ("/dev/vc/0"); - /* - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. -@@ -453,7 +453,7 @@ - activeVT = -1; - } - close(LinuxConsoleFd); /* make the vt-manager happy */ -- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); -+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); - if (fd >= 0) - { - memset (&vts, '\0', sizeof (vts)); /* valgrind */ diff --git a/packages/xserver/xserver-kdrive/disable-apm.patch b/packages/xserver/xserver-kdrive/disable-apm.patch deleted file mode 100644 index bd8842721b..0000000000 --- a/packages/xserver/xserver-kdrive/disable-apm.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000 -+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000 -@@ -342,7 +342,7 @@ - /* - * Open the APM driver - */ -- LinuxApmFd = open ("/dev/apm_bios", 2); -+ /*LinuxApmFd = open ("/dev/apm_bios", 2); - if (LinuxApmFd < 0 && errno == ENOENT) - LinuxApmFd = open ("/dev/misc/apm_bios", 2); - if (LinuxApmFd >= 0) -@@ -352,7 +352,7 @@ - RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); - AddEnabledDevice (LinuxApmFd); - } -- -+ */ - /* - * now get the VT - */ diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch deleted file mode 100644 index 9c43e52ead..0000000000 --- a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 -+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 -@@ -505,7 +505,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test "$KDRIVE" = yes; then -+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto" -+else - REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" -+fi - REQUIRED_LIBS="xfont xau fontenc" - - AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -@@ -1514,7 +1526,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x"$KDRIVE" = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined -@@ -1534,10 +1548,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! "x$KDRIVE" = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch deleted file mode 100644 index 13a6c2c954..0000000000 --- a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 -+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 -@@ -52,8 +52,8 @@ - /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ - - #define NEED_REPLIES - #ifdef HAVE_DIX_CONFIG_H --#include -+#include - #endif - - #include diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xserver/xserver-kdrive/enable-tslib.patch deleted file mode 100644 index e488657b74..0000000000 --- a/packages/xserver/xserver-kdrive/enable-tslib.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 -+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 -@@ -1438,6 +1446,10 @@ - fi - -- # tslib... -+ AC_CHECK_HEADERS([tslib.h]) -+ if test "$ac_cv_header_tslib_h" = yes; then -+ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support]) -+ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support]) -+ fi - - # damage shadow extension glx (NOTYET) fb mi - KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' -@@ -1467,7 +1479,7 @@ - AC_SUBST(KDRIVE_CFLAGS) - AC_SUBST(KDRIVE_PURE_LIBS) - AC_SUBST(KDRIVE_LIBS) --AM_CONDITIONAL(TSLIB, false) -+AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes]) - AM_CONDITIONAL(H3600_TS, false) - AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) - AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) diff --git a/packages/xserver/xserver-kdrive/epson.patch b/packages/xserver/xserver-kdrive/epson.patch deleted file mode 100644 index 07009bdc40..0000000000 --- a/packages/xserver/xserver-kdrive/epson.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200 -+++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100 -@@ -55,7 +55,7 @@ - { - KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); - #ifdef TOUCHSCREEN -- KdInitTouchScreen (&TsFuncs); -+ KdAddMouseDriver (&TsFuncs); - #endif - } - diff --git a/packages/xserver/xserver-kdrive/faster-rotated.patch b/packages/xserver/xserver-kdrive/faster-rotated.patch deleted file mode 100644 index eaf7ddec36..0000000000 --- a/packages/xserver/xserver-kdrive/faster-rotated.patch +++ /dev/null @@ -1,241 +0,0 @@ -Index: xserver/miext/shadow/shrotate.c -=================================================================== -RCS file: /scratch/openbsd/cvs/XF4/xc/programs/Xserver/miext/shadow/shrotate.c,v -retrieving revision 1.2 -diff -u -r1.2 shrotate.c ---- xserver/miext/shadow/shrotate.c 3 Nov 2004 00:09:54 -0000 1.2 -+++ xserver/miext/shadow/shrotate.c 20 Sep 2005 23:07:58 -0000 -@@ -45,6 +45,106 @@ - #define TOP_TO_BOTTOM 2 - #define BOTTOM_TO_TOP -2 - -+ -+static void -+shadowUpdateRotatePackedSubRectangle(shadowBufPtr pBuf, -+ FbBits *shaLine, int shaFirstShift, -+ int shaStepOverX, int shaStepOverY, -+ int shaStepDownX, int shaStepDownY, -+ int shaBpp, FbBits shaMask, -+ ScreenPtr pScreen, -+ int scr_x1, int scr_y, -+ int scr_h, int scr_w, -+ int pixelsPerBits) -+{ -+ FbBits *sha; -+ int shaShift; -+ int scr_x; -+ int w; -+ -+ /* -+ * Copy the bits, always write across the physical frame buffer -+ * to take advantage of write combining. -+ */ -+ while (scr_h--) -+ { -+ int p; -+ FbBits bits; -+ FbBits *win; -+ int i; -+ CARD32 winSize; -+ -+ sha = shaLine; -+ shaShift = shaFirstShift; -+ w = scr_w; -+ scr_x = scr_x1 * shaBpp >> FB_SHIFT; -+ -+ while (w) -+ { -+ /* -+ * Map some of this line -+ */ -+ win = (FbBits *) (*pBuf->window) (pScreen, -+ scr_y, -+ scr_x << 2, -+ SHADOW_WINDOW_WRITE, -+ &winSize, -+ pBuf->closure); -+ i = (winSize >> 2); -+ if (i > w) -+ i = w; -+ w -= i; -+ scr_x += i; -+ /* -+ * Copy the portion of the line mapped -+ */ -+ while (i--) -+ { -+ bits = 0; -+ p = pixelsPerBits; -+ /* -+ * Build one word of output from multiple inputs -+ */ -+ while (p--) -+ { -+ bits = FbScrLeft(bits, shaBpp); -+ bits |= FbScrRight (*sha, shaShift) & shaMask; -+ -+ shaShift -= shaStepOverX; -+ if (shaShift >= FB_UNIT) -+ { -+ shaShift -= FB_UNIT; -+ sha--; -+ } -+ else if (shaShift < 0) -+ { -+ shaShift += FB_UNIT; -+ sha++; -+ } -+ sha += shaStepOverY; -+ } -+ *win++ = bits; -+ } -+ } -+ scr_y++; -+ shaFirstShift -= shaStepDownX; -+ if (shaFirstShift >= FB_UNIT) -+ { -+ shaFirstShift -= FB_UNIT; -+ shaLine--; -+ } -+ else if (shaFirstShift < 0) -+ { -+ shaFirstShift += FB_UNIT; -+ shaLine++; -+ } -+ shaLine += shaStepDownY; -+ } -+} -+ -+#define BLOCKSIZE_HEIGHT 32 -+#define BLOCKSIZE_WIDTH 32 -+ - void - shadowUpdateRotatePacked (ScreenPtr pScreen, - shadowBufPtr pBuf) -@@ -61,7 +161,6 @@ - int sha_x1 = 0, sha_y1 = 0; - int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; - int scr_x, scr_y; -- int w; - int pixelsPerBits; - int pixelsMask; - FbStride shaStepOverY = 0, shaStepDownY = 0; -@@ -221,86 +320,46 @@ - ((sha_x1 * shaBpp) >> FB_SHIFT)); - - /* -- * Copy the bits, always write across the physical frame buffer -- * to take advantage of write combining. -+ * Copy in blocks of size BLOCKSIZE_WIDTH x BLOCKSIZE_HEIGHT -+ * to reduce the number of cache misses when rotating 90 or -+ * 270 degrees. - */ -- while (scr_h--) -+ for (scr_y = scr_y1; scr_y < scr_y2; scr_y += BLOCKSIZE_HEIGHT) - { -- int p; -- FbBits bits; -- FbBits *win; -- int i; -- CARD32 winSize; -- - sha = shaLine; - shaShift = shaFirstShift; -- w = scr_w; -- scr_x = scr_x1 * shaBpp >> FB_SHIFT; - -- while (w) -+ for (scr_x = scr_x1; scr_x < scr_x2; scr_x += BLOCKSIZE_WIDTH) - { -- /* -- * Map some of this line -- */ -- win = (FbBits *) (*pBuf->window) (pScreen, -- scr_y, -- scr_x << 2, -- SHADOW_WINDOW_WRITE, -- &winSize, -- pBuf->closure); -- i = (winSize >> 2); -- if (i > w) -- i = w; -- w -= i; -- scr_x += i; -- /* -- * Copy the portion of the line mapped -- */ -- while (i--) -- { -- bits = 0; -- p = pixelsPerBits; -- /* -- * Build one word of output from multiple inputs -- * -- * Note that for 90/270 rotations, this will walk -- * down the shadow hitting each scanline once. -- * This is probably not very efficient. -- */ -- while (p--) -- { -- bits = FbScrLeft(bits, shaBpp); -- bits |= FbScrRight (*sha, shaShift) & shaMask; -+ int h = BLOCKSIZE_HEIGHT; -+ int w = BLOCKSIZE_WIDTH; - -- shaShift -= shaStepOverX; -- if (shaShift >= FB_UNIT) -- { -- shaShift -= FB_UNIT; -- sha--; -- } -- else if (shaShift < 0) -- { -- shaShift += FB_UNIT; -- sha++; -- } -- sha += shaStepOverY; -- } -- *win++ = bits; -- } -- } -- scr_y++; -- shaFirstShift -= shaStepDownX; -- if (shaFirstShift >= FB_UNIT) -- { -- shaFirstShift -= FB_UNIT; -- shaLine--; -- } -- else if (shaFirstShift < 0) -- { -- shaFirstShift += FB_UNIT; -- shaLine++; -+ if (scr_y + h > scr_y2) -+ h = scr_y2 - scr_y; -+ if (scr_x + w > scr_x2) -+ w = scr_x2 - scr_x; -+ w = (w * shaBpp) >> FB_SHIFT; -+ -+ shadowUpdateRotatePackedSubRectangle -+ (pBuf, -+ sha, shaShift, -+ shaStepOverX, shaStepOverY, -+ shaStepDownX, shaStepDownY, -+ shaBpp, shaMask, -+ pScreen, -+ scr_x, scr_y, -+ h, w, -+ pixelsPerBits); -+ -+ shaShift -= BLOCKSIZE_WIDTH * shaStepOverX; -+ sha += BLOCKSIZE_WIDTH * shaStepOverY; -+ sha -= (shaShift >> FB_SHIFT); -+ shaShift &= FB_MASK; - } -- shaLine += shaStepDownY; -+ shaFirstShift -= BLOCKSIZE_HEIGHT * shaStepDownX; -+ shaLine += BLOCKSIZE_HEIGHT * shaStepDownY; -+ shaLine -= (shaFirstShift >> FB_SHIFT); -+ shaFirstShift &= FB_MASK; - } - } - } diff --git a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/packages/xserver/xserver-kdrive/fbdev-not-fix.patch deleted file mode 100644 index f87e7cc2cd..0000000000 --- a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 -+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 -@@ -198,6 +198,11 @@ - return FALSE; - } - -+ /* Re-get the "fixed" parameters since they might have changed */ -+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); -+ if (k < 0) -+ perror ("FBIOGET_FSCREENINFO"); -+ - /* Now get the new screeninfo */ - ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); - depth = priv->var.bits_per_pixel; diff --git a/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/packages/xserver/xserver-kdrive/kdrive-evdev.patch deleted file mode 100644 index 2dc22bf50e..0000000000 --- a/packages/xserver/xserver-kdrive/kdrive-evdev.patch +++ /dev/null @@ -1,515 +0,0 @@ -# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at -# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html -diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c ---- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200 -+++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200 -@@ -31,9 +31,11 @@ - #include - #include - #include -+#include - #include "inputstr.h" - #include "scrnintstr.h" - #include "kdrive.h" -+#include "kkeymap.h" - - #define NUM_EVENTS 128 - #define ABS_UNSET -65535 -@@ -105,9 +107,10 @@ - { - KdMouseInfo *mi = closure; - Kevdev *ke = mi->driver; -- int i; -+ int i, j; - struct input_event events[NUM_EVENTS]; - int n; -+ int flags; - - n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event)); - if (n <= 0) -@@ -115,22 +118,64 @@ - n /= sizeof (struct input_event); - for (i = 0; i < n; i++) - { -+ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState; - switch (events[i].type) { - case EV_SYN: - break; - case EV_KEY: -- EvdevMotion (mi); -- ASSIGNBIT(ke->key,events[i].code, events[i].value); -- if (events[i].code < 0x100) -- ErrorF ("key %d %d\n", events[i].code, events[i].value); -- else -- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value); -+ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) { -+ switch (events[i].code) { -+ case BTN_LEFT: -+ if (events[i].value == 1) -+ flags |= KD_BUTTON_1; -+ else -+ flags &= ~KD_BUTTON_1; -+ break; -+ case BTN_MIDDLE: -+ if (events[i].value == 1) -+ flags |= KD_BUTTON_2; -+ else -+ flags &= ~KD_BUTTON_2; -+ break; -+ case BTN_RIGHT: -+ if (events[i].value == 1) -+ flags |= KD_BUTTON_3; -+ else -+ flags &= ~KD_BUTTON_3; -+ break; -+ default: -+ /* Unknow button */ -+ break; -+ } -+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); -+ } - break; - case EV_REL: -- ke->rel[events[i].code] += events[i].value; -+ if (events[i].code == REL_X) { -+ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0); -+ } -+ else if (events[i].code == REL_Y) { -+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value); -+ } -+ else if (events[i].code == REL_WHEEL) { -+ for (j = 0; j < abs (events[i].value); j++) { -+ if (events[i].value > 0) -+ flags |= KD_BUTTON_4; -+ else -+ flags |= KD_BUTTON_5; -+ -+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); -+ -+ if (events[i].value > 0) -+ flags &= ~KD_BUTTON_4; -+ else -+ flags &= ~KD_BUTTON_5; -+ -+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0); -+ } /* events[i].code == REL_WHEEL */ -+ } - break; - case EV_ABS: -- ke->abs[events[i].code] = events[i].value; - break; - } - } -@@ -173,6 +218,12 @@ - fd = open (kdefaultEvdev[i], 2); - if (fd >= 0) - { -+ if (ioctl (fd, EVIOCGRAB, 1) < 0) -+ { -+ close (fd); -+ continue; -+ } -+ - mi->name = KdSaveString (kdefaultEvdev[i]); - break; - } -@@ -287,7 +338,319 @@ - EvdevFini, - }; - --#if 0 -+/* Keyboard */ -+ -+int kbd_fd = -1; -+int EvdevInputType = 0; -+ -+KeySym evdevKeymap[(194 - 1 + 1) * 2] = { -+/* These are directly mapped from DOS scanset 0 */ -+/* 1 8 */ XK_Escape, NoSymbol, -+/* 2 9 */ XK_1, XK_exclam, -+/* 3 10 */ XK_2, XK_at, -+/* 4 11 */ XK_3, XK_numbersign, -+/* 5 12 */ XK_4, XK_dollar, -+/* 6 13 */ XK_5, XK_percent, -+/* 7 14 */ XK_6, XK_asciicircum, -+/* 8 15 */ XK_7, XK_ampersand, -+/* 9 16 */ XK_8, XK_asterisk, -+/* 10 17 */ XK_9, XK_parenleft, -+/* 11 18 */ XK_0, XK_parenright, -+/* 12 19 */ XK_minus, XK_underscore, -+/* 13 20 */ XK_equal, XK_plus, -+/* 14 21 */ XK_BackSpace, NoSymbol, -+/* 15 22 */ XK_Tab, NoSymbol, -+/* 16 23 */ XK_Q, NoSymbol, -+/* 17 24 */ XK_W, NoSymbol, -+/* 18 25 */ XK_E, NoSymbol, -+/* 19 26 */ XK_R, NoSymbol, -+/* 20 27 */ XK_T, NoSymbol, -+/* 21 28 */ XK_Y, NoSymbol, -+/* 22 29 */ XK_U, NoSymbol, -+/* 23 30 */ XK_I, NoSymbol, -+/* 24 31 */ XK_O, NoSymbol, -+/* 25 32 */ XK_P, NoSymbol, -+/* 26 33 */ XK_bracketleft, XK_braceleft, -+/* 27 34 */ XK_bracketright, XK_braceright, -+/* 28 35 */ XK_Return, NoSymbol, -+/* 29 36 */ XK_Control_L, NoSymbol, -+/* 30 37 */ XK_A, NoSymbol, -+/* 31 38 */ XK_S, NoSymbol, -+/* 32 39 */ XK_D, NoSymbol, -+/* 33 40 */ XK_F, NoSymbol, -+/* 34 41 */ XK_G, NoSymbol, -+/* 35 42 */ XK_H, NoSymbol, -+/* 36 43 */ XK_J, NoSymbol, -+/* 37 44 */ XK_K, NoSymbol, -+/* 38 45 */ XK_L, NoSymbol, -+/* 39 46 */ XK_semicolon, XK_colon, -+/* 40 47 */ XK_apostrophe, XK_quotedbl, -+/* 41 48 */ XK_grave, XK_asciitilde, -+/* 42 49 */ XK_Shift_L, NoSymbol, -+/* 43 50 */ XK_backslash, XK_bar, -+/* 44 51 */ XK_Z, NoSymbol, -+/* 45 52 */ XK_X, NoSymbol, -+/* 46 53 */ XK_C, NoSymbol, -+/* 47 54 */ XK_V, NoSymbol, -+/* 48 55 */ XK_B, NoSymbol, -+/* 49 56 */ XK_N, NoSymbol, -+/* 50 57 */ XK_M, NoSymbol, -+/* 51 58 */ XK_comma, XK_less, -+/* 52 59 */ XK_period, XK_greater, -+/* 53 60 */ XK_slash, XK_question, -+/* 54 61 */ XK_Shift_R, NoSymbol, -+/* 55 62 */ XK_KP_Multiply, NoSymbol, -+/* 56 63 */ XK_Alt_L, XK_Meta_L, -+/* 57 64 */ XK_space, NoSymbol, -+/* 58 65 */ XK_Caps_Lock, NoSymbol, -+/* 59 66 */ XK_F1, NoSymbol, -+/* 60 67 */ XK_F2, NoSymbol, -+/* 61 68 */ XK_F3, NoSymbol, -+/* 62 69 */ XK_F4, NoSymbol, -+/* 63 70 */ XK_F5, NoSymbol, -+/* 64 71 */ XK_F6, NoSymbol, -+/* 65 72 */ XK_F7, NoSymbol, -+/* 66 73 */ XK_F8, NoSymbol, -+/* 67 74 */ XK_F9, NoSymbol, -+/* 68 75 */ XK_F10, NoSymbol, -+/* 69 76 */ XK_Break, XK_Pause, -+/* 70 77 */ XK_Scroll_Lock, NoSymbol, -+/* 71 78 */ XK_KP_Home, XK_KP_7, -+/* 72 79 */ XK_KP_Up, XK_KP_8, -+/* 73 80 */ XK_KP_Page_Up, XK_KP_9, -+/* 74 81 */ XK_KP_Subtract, NoSymbol, -+/* 75 82 */ XK_KP_Left, XK_KP_4, -+/* 76 83 */ XK_KP_5, NoSymbol, -+/* 77 84 */ XK_KP_Right, XK_KP_6, -+/* 78 85 */ XK_KP_Add, NoSymbol, -+/* 79 86 */ XK_KP_End, XK_KP_1, -+/* 80 87 */ XK_KP_Down, XK_KP_2, -+/* 81 88 */ XK_KP_Page_Down, XK_KP_3, -+/* 82 89 */ XK_KP_Insert, XK_KP_0, -+/* 83 90 */ XK_KP_Delete, XK_KP_Decimal, -+/* 84 91 */ NoSymbol, NoSymbol, -+/* 85 92 */ NoSymbol, NoSymbol, -+/* 86 93 */ NoSymbol, NoSymbol, -+/* 87 94 */ XK_F11, NoSymbol, -+/* 88 95 */ XK_F12, NoSymbol, -+ -+/* These are remapped from the extended set (using ExtendMap) */ -+ -+/* 89 96 */ XK_Control_R, NoSymbol, -+/* 90 97 */ XK_KP_Enter, NoSymbol, -+/* 91 98 */ XK_KP_Divide, NoSymbol, -+/* 92 99 */ XK_Sys_Req, XK_Print, -+/* 93 100 */ XK_Alt_R, XK_Meta_R, -+/* 94 101 */ XK_Num_Lock, NoSymbol, -+/* 95 102 */ XK_Home, NoSymbol, -+/* 96 103 */ XK_Up, NoSymbol, -+/* 97 104 */ XK_Page_Up, NoSymbol, -+/* 98 105 */ XK_Left, NoSymbol, -+/* 99 106 */ XK_Right, NoSymbol, -+/* 100 107 */ XK_End, NoSymbol, -+/* 101 108 */ XK_Down, NoSymbol, -+/* 102 109 */ XK_Page_Down, NoSymbol, -+/* 103 110 */ XK_Insert, NoSymbol, -+/* 104 111 */ XK_Delete, NoSymbol, -+/* 105 112 */ XK_Super_L, NoSymbol, -+/* 106 113 */ XK_Super_R, NoSymbol, -+/* 107 114 */ XK_Menu, NoSymbol, -+/* 108 115 */ NoSymbol, NoSymbol, -+/* 109 116 */ NoSymbol, NoSymbol, -+/* 110 117 */ NoSymbol, NoSymbol, -+/* 111 118 */ NoSymbol, NoSymbol, -+/* 112 119 */ NoSymbol, NoSymbol, -+ -+/* 113 120 */ NoSymbol, NoSymbol, -+/* 114 121 */ NoSymbol, NoSymbol, -+/* 115 122 */ NoSymbol, NoSymbol, -+/* 116 123 */ NoSymbol, NoSymbol, -+/* 117 124 */ NoSymbol, NoSymbol, -+/* 118 125 */ NoSymbol, NoSymbol, -+/* 119 126 */ NoSymbol, NoSymbol, -+/* 120 127 */ NoSymbol, NoSymbol, -+/* 121 128 */ NoSymbol, NoSymbol, -+/* 122 129 */ NoSymbol, NoSymbol, -+/* 123 130 */ NoSymbol, NoSymbol, -+/* 124 131 */ NoSymbol, NoSymbol, -+/* 125 132 */ NoSymbol, NoSymbol, -+/* 126 133 */ NoSymbol, NoSymbol, -+/* 127 134 */ NoSymbol, NoSymbol, -+/* 128 135 */ NoSymbol, NoSymbol, -+/* 129 136 */ NoSymbol, NoSymbol, -+/* 130 137 */ NoSymbol, NoSymbol, -+/* 131 138 */ NoSymbol, NoSymbol, -+/* 132 139 */ NoSymbol, NoSymbol, -+/* 133 140 */ NoSymbol, NoSymbol, -+/* 134 141 */ NoSymbol, NoSymbol, -+/* 135 142 */ NoSymbol, NoSymbol, -+/* 136 143 */ NoSymbol, NoSymbol, -+/* 137 144 */ NoSymbol, NoSymbol, -+/* 138 145 */ NoSymbol, NoSymbol, -+/* 139 146 */ NoSymbol, NoSymbol, -+/* 140 147 */ NoSymbol, NoSymbol, -+/* 141 148 */ NoSymbol, NoSymbol, -+/* 142 149 */ NoSymbol, NoSymbol, -+/* 143 150 */ NoSymbol, NoSymbol, -+/* 144 151 */ NoSymbol, NoSymbol, -+/* 145 152 */ NoSymbol, NoSymbol, -+/* 146 153 */ NoSymbol, NoSymbol, -+/* 147 154 */ NoSymbol, NoSymbol, -+/* 148 155 */ NoSymbol, NoSymbol, -+/* 149 156 */ NoSymbol, NoSymbol, -+/* 150 157 */ NoSymbol, NoSymbol, -+/* 151 158 */ NoSymbol, NoSymbol, -+/* 152 159 */ NoSymbol, NoSymbol, -+/* 153 160 */ NoSymbol, NoSymbol, -+/* 154 161 */ NoSymbol, NoSymbol, -+/* 155 162 */ NoSymbol, NoSymbol, -+/* 156 163 */ NoSymbol, NoSymbol, -+/* 157 164 */ NoSymbol, NoSymbol, -+/* 158 165 */ NoSymbol, NoSymbol, -+/* 159 166 */ NoSymbol, NoSymbol, -+/* 160 167 */ NoSymbol, NoSymbol, -+/* 161 168 */ NoSymbol, NoSymbol, -+/* 162 169 */ NoSymbol, NoSymbol, -+/* 163 170 */ NoSymbol, NoSymbol, -+/* 164 171 */ NoSymbol, NoSymbol, -+/* 165 172 */ NoSymbol, NoSymbol, -+/* 166 173 */ NoSymbol, NoSymbol, -+/* 167 174 */ NoSymbol, NoSymbol, -+/* 168 175 */ NoSymbol, NoSymbol, -+/* 169 176 */ NoSymbol, NoSymbol, -+/* 170 177 */ NoSymbol, NoSymbol, -+/* 171 178 */ NoSymbol, NoSymbol, -+/* 172 179 */ NoSymbol, NoSymbol, -+/* 173 180 */ NoSymbol, NoSymbol, -+/* 174 181 */ NoSymbol, NoSymbol, -+/* 175 182 */ NoSymbol, NoSymbol, -+/* 176 183 */ NoSymbol, NoSymbol, -+/* 177 184 */ NoSymbol, NoSymbol, -+/* 178 185 */ NoSymbol, NoSymbol, -+/* 179 186 */ NoSymbol, NoSymbol, -+/* 180 187 */ NoSymbol, NoSymbol, -+/* 181 188 */ NoSymbol, NoSymbol, -+/* 182 189 */ NoSymbol, NoSymbol, -+/* 183 190 */ NoSymbol, NoSymbol, -+/* 184 191 */ NoSymbol, NoSymbol, -+/* 185 192 */ NoSymbol, NoSymbol, -+/* 186 193 */ NoSymbol, NoSymbol, -+/* 187 194 */ NoSymbol, NoSymbol, -+/* 188 195 */ NoSymbol, NoSymbol, -+/* 189 196 */ NoSymbol, NoSymbol, -+/* 190 197 */ NoSymbol, NoSymbol, -+/* 191 198 */ NoSymbol, NoSymbol, -+/* 192 199 */ NoSymbol, NoSymbol, -+/* 193 200 */ NoSymbol, NoSymbol, -+/* 194 201 */ NoSymbol, NoSymbol, -+}; -+ -+static void -+EvdevKbdRead (int fd, void *closure) -+{ -+ int i, n; -+ struct input_event events[NUM_EVENTS]; -+ -+ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event)); -+ if (n <= 0) -+ return; -+ -+ n /= sizeof (struct input_event); -+ -+ for (i = 0; i < n; i++) -+ { -+ if (events[i].type == EV_KEY) -+ KdEnqueueKeyboardEvent (events[i].code, !events[i].value); -+ } -+} -+ -+static void -+EvdevKbdLoad (void) -+{ -+ kdMinScanCode = 0; -+ kdMaxScanCode = 193; -+ kdKeymapWidth = 2; -+ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap)); -+} -+ -+static int -+EvdevKbdInit (void) -+{ -+ int fd, i; -+ -+ if (!EvdevInputType) -+ EvdevInputType = KdAllocInputType (); -+ -+ if (!kdKeyboard) -+ { -+ for (i = 0; i < NUM_DEFAULT_EVDEV; i++) -+ { -+ fd = open (kdefaultEvdev[i], 2); -+ if (fd >= 0) -+ { -+ kdKeyboard = KdSaveString (kdefaultEvdev[i]); -+ break; -+ } -+ } -+ } -+ else -+ { -+ fd = open (kdKeyboard, O_RDWR); -+ if (fd < 0) -+ return FALSE; -+ } -+ -+ if (ioctl (fd, EVIOCGRAB, 1) < 0) -+ { -+ close (fd); -+ return FALSE; -+ } -+ -+ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL)) -+ return FALSE; -+ -+ kbd_fd = fd; -+ return TRUE; -+} -+ -+static void -+EvdevKbdFini (void) -+{ -+} -+ -+static void -+EvdevKbdLeds (int leds) -+{ -+ struct input_event event; -+ -+ memset(&event, 0, sizeof(event)); -+ -+ event.type = EV_LED; -+ event.code = LED_CAPSL; -+ event.value = leds & (1 << 0) ? 1 : 0; -+ write(kbd_fd, (char *) &event, sizeof(event)); -+ -+ event.type = EV_LED; -+ event.code = LED_NUML; -+ event.value = leds & (1 << 1) ? 1 : 0; -+ write(kbd_fd, (char *) &event, sizeof(event)); -+ -+ event.type = EV_LED; -+ event.code = LED_SCROLLL; -+ event.value = leds & (1 << 2) ? 1 : 0; -+ write(kbd_fd, (char *) &event, sizeof(event)); -+ -+ event.type = EV_LED; -+ event.code = LED_COMPOSE; -+ event.value = leds & (1 << 3) ? 1 : 0; -+ write(kbd_fd, (char *) &event, sizeof(event)); -+} -+ -+static void -+EvdevKbdBell (int volume, int frequency, int duration) -+{ -+} -+ - KdKeyboardFuncs LinuxEvdevKeyboardFuncs = { - EvdevKbdLoad, - EvdevKbdInit, -@@ -296,4 +659,4 @@ - EvdevKbdFini, - 0, - }; --#endif -+ -diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c ---- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200 -+++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200 -@@ -73,6 +73,7 @@ - Bool kdEnabled; - int kdSubpixelOrder; - int kdVirtualTerminal = -1; -+char *kdKeyboard = 0; - Bool kdSwitchPending; - char *kdSwitchCmd; - DDXPointRec kdOrigin; -@@ -795,6 +796,14 @@ - UseMsg (); - return 2; - } -+ if (!strcmp (argv[i], "-keyboard")) -+ { -+ if ((i+1) < argc) -+ kdKeyboard = argv[i+1]; -+ else -+ UseMsg (); -+ return 2; -+ } - if (!strcmp (argv[i], "-rgba")) - { - if ((i+1) < argc) -diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h ---- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200 -+++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200 -@@ -416,6 +416,7 @@ - extern Bool kdDisableZaphod; - extern Bool kdDontZap; - extern int kdVirtualTerminal; -+extern char *kdKeyboard; - extern char *kdSwitchCmd; - extern KdOsFuncs *kdOsFuncs; - -@@ -769,7 +770,7 @@ - ProcessInputEvents (void); - - extern KdMouseFuncs LinuxMouseFuncs; --extern KdMouseFuncs LinuxEvdevFuncs; -+extern KdMouseFuncs LinuxEvdevMouseFuncs; - extern KdMouseFuncs Ps2MouseFuncs; - extern KdMouseFuncs BusMouseFuncs; - extern KdMouseFuncs MsMouseFuncs; -@@ -777,6 +778,7 @@ - extern KdMouseFuncs TsFuncs; - #endif - extern KdKeyboardFuncs LinuxKeyboardFuncs; -+extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs; - extern KdOsFuncs LinuxFuncs; - - extern KdMouseFuncs VxWorksMouseFuncs; -diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c ---- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200 -+++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200 -@@ -1300,6 +1300,7 @@ - xE.u.u.type = KeyPress; - xE.u.u.detail = key_code; - -+#ifndef XKB - switch (KEYCOL1(key_code)) - { - case XK_Num_Lock: -@@ -1313,6 +1314,7 @@ - else - xE.u.u.type = KeyPress; - } -+#endif - - /* - * Check pressed keys which are already down diff --git a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch deleted file mode 100644 index d4f885ee26..0000000000 --- a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100 -+++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100 -@@ -28,6 +28,8 @@ - #endif - #include - -+extern int use_evdev; -+ - void - InitCard (char *name) - { -@@ -45,7 +47,10 @@ - void - InitInput (int argc, char **argv) - { -- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); -+ if (use_evdev) -+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs); -+ else -+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); - #ifdef TOUCHSCREEN - KdAddMouseDriver (&TsFuncs); - #endif ---- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100 -+++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100 -@@ -44,6 +44,8 @@ - #include "dpmsproc.h" - #endif - -+int use_evdev = 0; -+ - typedef struct _kdDepths { - CARD8 depth; - CARD8 bpp; -@@ -687,6 +689,7 @@ - ErrorF("-videoTest Start the server, pause momentarily and exit\n"); - ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n"); - ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n"); -+ ErrorF("-use-evdev Use Linux evdev input\n"); - ErrorF("-switchCmd Command to execute on vt switch\n"); - ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n"); - ErrorF("vtxx Use virtual terminal xx instead of the next available\n"); -@@ -796,6 +799,10 @@ - UseMsg (); - return 2; - } -+ if (!strcmp (argv[i], "-use-evdev")) -+ { -+ use_evdev = 1; -+ } - if (!strcmp (argv[i], "-keyboard")) - { - if ((i+1) < argc) diff --git a/packages/xserver/xserver-kdrive/kmode.patch b/packages/xserver/xserver-kdrive/kmode.patch deleted file mode 100644 index 5ad3e4e277..0000000000 --- a/packages/xserver/xserver-kdrive/kmode.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200 -+++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200 -@@ -41,6 +41,11 @@ - 1, 11, 14, KdSyncNegative, - }, - -+ { 240, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ - /* Other VESA modes */ - { 640, 350, 85, 31500, /* VESA */ - 32, 96, 192, KdSyncPositive, /* 26.413 */ -@@ -80,6 +85,13 @@ - 16, 48, 160, KdSyncNegative, /* 31.469 */ - 10, 33, 45, KdSyncNegative, /* 59.940 */ - }, -+ -+ -+ { 480, 640, 60, 0, /* VESA */ -+ 0, 0, 0, KdSyncNegative, /* 31.469 */ -+ 0, 0, 0, KdSyncNegative, /* 59.940 */ -+ }, -+ - - /* 800x600 modes */ - { 800, 600, 85, 56250, /* VESA */ diff --git a/packages/xserver/xserver-kdrive/no-serial-probing.patch b/packages/xserver/xserver-kdrive/no-serial-probing.patch deleted file mode 100644 index 35ccadaa8d..0000000000 --- a/packages/xserver/xserver-kdrive/no-serial-probing.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 -+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 -@@ -927,8 +927,10 @@ char *kdefaultMouse[] = { - "/dev/psaux", - "/dev/input/mice", - "/dev/adbmouse", -+#ifdef BREAK_MY_SERIAL_CONSOLE - "/dev/ttyS0", - "/dev/ttyS1", -+#endif - }; - - #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0])) diff --git a/packages/xserver/xserver-kdrive/onlyfb.patch b/packages/xserver/xserver-kdrive/onlyfb.patch deleted file mode 100644 index e773324981..0000000000 --- a/packages/xserver/xserver-kdrive/onlyfb.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/Makefile.am~onlyfb -+++ xserver/hw/kdrive/Makefile.am -@@ -17,12 +17,4 @@ - SUBDIRS = \ - src \ - linux \ -- $(XSDL_SUBDIRS) \ -- $(FBDEV_SUBDIRS) \ -- $(VESA_SUBDIRS) \ -- $(XEPHYR_SUBDIRS) \ -- ati \ -- fake \ -- ephyr \ -- i810 \ -- epson -+ $(FBDEV_SUBDIRS) diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xserver/xserver-kdrive/optional-xkb.patch deleted file mode 100644 index d9ef51c5ba..0000000000 --- a/packages/xserver/xserver-kdrive/optional-xkb.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200 -+++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200 -@@ -35,6 +35,10 @@ - XINPUT_DIR=Xi - endif - -+if XKB -+XKB_DIR=xkb -+endif -+ - if DBE - DBE_DIR=dbe - endif -@@ -51,7 +55,7 @@ - randr \ - render \ - $(XINPUT_DIR) \ -- xkb \ -+ $(XKB_DIR) \ - $(DBE_DIR) \ - $(MFB_DIR) \ - $(AFB_DIR) \ ---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200 -+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200 -@@ -418,6 +418,7 @@ - AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) - AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes]) - AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) -+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) - - dnl DDXes. - AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -739,12 +740,15 @@ - - AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) - --AC_DEFINE(XKB, 1, [Build XKB]) --AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) --AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) --REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" --XKB_LIB='$(top_builddir)/xkb/libxkb.la' --XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) -+if test "x$XKB" = xyes; then -+ AC_DEFINE(XKB, 1, [Build XKB]) -+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" -+ XKB_LIB='$(top_builddir)/xkb/libxkb.la' -+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+fi - - AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, - [Do not have `strcasecmp'.])) diff --git a/packages/xserver/xserver-kdrive/xcalibrate.patch b/packages/xserver/xserver-kdrive/xcalibrate.patch deleted file mode 100644 index 3f8cd4ea5c..0000000000 --- a/packages/xserver/xserver-kdrive/xcalibrate.patch +++ /dev/null @@ -1,351 +0,0 @@ ---- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200 -@@ -385,6 +385,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XEVIE - extern void XevieExtensionInit(INITARGS); - #endif -@@ -679,6 +682,9 @@ - #ifdef DAMAGE - if (!noDamageExtension) DamageExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - void ---- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200 -@@ -407,6 +407,7 @@ - AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes]) - AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes]) - AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes]) -+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes]) - AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes]) - AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no]) - AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes]) -@@ -641,6 +642,12 @@ - AC_DEFINE(XCSECURITY, 1, [Build Security extension]) - fi - -+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) -+if test "x$XCALIBRATE" = xyes; then -+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" -+fi -+ - AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes]) - if test "x$XEVIE" = xyes; then - AC_DEFINE(XEVIE, 1, [Build XEvIE extension]) -@@ -1466,7 +1473,7 @@ - KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' - KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a' - KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' -- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" -+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB" - - # check if we can build Xephyr - PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) ---- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200 -@@ -22,4 +22,7 @@ - /* Support tslib touchscreen abstraction library */ - #undef TSLIB - -+/* Enable XCalibrate extension */ -+#undef XCALIBRATE -+ - #endif /* _KDRIVE_CONFIG_H_ */ ---- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200 -@@ -78,6 +78,11 @@ - AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" - endif - -+XCALIBRATE_SRCS = xcalibrate.c -+if XCALIBRATE -+BUILTIN_SRCS += $(XCALIBRATE_SRCS) -+endif -+ - # X EVent Interception Extension: allows accessibility helpers & composite - # managers to intercept events from input devices and transform as needed - # before the clients see them. -@@ -155,6 +160,7 @@ - $(SCREENSAVER_SRCS) \ - $(XCSECURITY_SRCS) \ - $(XINERAMA_SRCS) \ -+ $(XCALIBRATE_SRCS) \ - $(XEVIE_SRCS) \ - $(XPRINT_SRCS) \ - $(APPGROUP_SRCS) \ ---- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200 -@@ -0,0 +1,262 @@ -+/* -+ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ -+ * -+ * Copyright © 2003 Philip Blundell -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Philip Blundell not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Philip Blundell makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#ifdef HAVE_KDRIVE_CONFIG_H -+#include -+#endif -+ -+#define NEED_EVENTS -+#define NEED_REPLIES -+ -+#include -+#include -+#include "misc.h" -+#include "os.h" -+#include "dixstruct.h" -+#include "extnsionst.h" -+#include "swaprep.h" -+ -+#include -+#include -+ -+extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); -+extern void *tslib_raw_event_closure; -+ -+static CARD8 XCalibrateReqCode; -+int XCalibrateEventBase; -+int XCalibrateReqBase; -+int XCalibrateErrorBase; -+ -+static ClientPtr xcalibrate_client; -+ -+static void -+xcalibrate_event_hook (int x, int y, int pressure, void *closure) -+{ -+ ClientPtr pClient = (ClientPtr) closure; -+ xXCalibrateRawTouchscreenEvent ev; -+ -+ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen; -+ ev.sequenceNumber = pClient->sequence; -+ ev.x = x; -+ ev.y = y; -+ ev.pressure = pressure; -+ -+ if (!pClient->clientGone) -+ WriteEventsToClient (pClient, 1, (xEvent *) &ev); -+} -+ -+static int -+ProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ xXCalibrateQueryVersionReply rep; -+ CARD16 client_major, client_minor; /* not used */ -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ -+ client_major = stuff->majorVersion; -+ client_minor = stuff->minorVersion; -+ -+ fprintf(stderr, "%s(): called\n", __func__); -+ -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.majorVersion = XCALIBRATE_MAJOR_VERSION; -+ rep.minorVersion = XCALIBRATE_MINOR_VERSION; -+ if (client->swapped) { -+ int n; -+ swaps(&rep.sequenceNumber, n); -+ swapl(&rep.length, n); -+ swaps(&rep.majorVersion, n); -+ swaps(&rep.minorVersion, n); -+ } -+ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep); -+ return (client->noClientException); -+} -+ -+static int -+SProcXCalibrateQueryVersion (ClientPtr client) -+{ -+ REQUEST(xXCalibrateQueryVersionReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq); -+ swaps(&stuff->majorVersion,n); -+ swaps(&stuff->minorVersion,n); -+ return ProcXCalibrateQueryVersion(client); -+} -+ -+static int -+ProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ xXCalibrateRawModeReply rep; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ memset (&rep, 0, sizeof (rep)); -+ rep.type = X_Reply; -+ rep.sequenceNumber = client->sequence; -+ -+ if (stuff->on) -+ { -+ if (xcalibrate_client == NULL) -+ { -+ /* Start calibrating. */ -+ xcalibrate_client = client; -+ tslib_raw_event_hook = xcalibrate_event_hook; -+ tslib_raw_event_closure = client; -+ rep.status = GrabSuccess; -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ else -+ { -+ if (xcalibrate_client == client) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ rep.status = GrabSuccess; -+ -+ /* Cycle input off and on to reload configuration. */ -+ KdDisableInput (); -+ KdEnableInput (); -+ } -+ else -+ { -+ rep.status = AlreadyGrabbed; -+ } -+ } -+ -+ if (client->swapped) -+ { -+ int n; -+ -+ swaps (&rep.sequenceNumber, n); -+ swaps (&rep.status, n); -+ } -+ WriteToClient(client, sizeof (rep), (char *) &rep); -+ return (client->noClientException); -+} -+ -+ -+static int -+SProcXCalibrateSetRawMode (ClientPtr client) -+{ -+ REQUEST(xXCalibrateRawModeReq); -+ int n; -+ -+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq); -+ -+ swaps(&stuff->on, n); -+ -+ return ProcXCalibrateSetRawMode(client); -+} -+ -+static void -+XCalibrateResetProc (ExtensionEntry *extEntry) -+{ -+} -+ -+static int -+ProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return ProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return ProcXCalibrateSetRawMode(client); -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static int -+SProcXCalibrateDispatch (ClientPtr client) -+{ -+ REQUEST(xReq); -+ int n; -+ -+ swaps(&stuff->length,n); -+ -+ switch (stuff->data) { -+ case X_XCalibrateQueryVersion: -+ return SProcXCalibrateQueryVersion(client); -+ case X_XCalibrateRawMode: -+ return SProcXCalibrateSetRawMode(client); -+ -+ default: break; -+ } -+ -+ return BadRequest; -+} -+ -+static void -+XCalibrateClientCallback (CallbackListPtr *list, -+ pointer closure, -+ pointer data) -+{ -+ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; -+ ClientPtr pClient = clientinfo->client; -+ -+ if (clientinfo->setup == NULL -+ && xcalibrate_client != NULL -+ && xcalibrate_client == pClient) -+ { -+ /* Stop calibrating. */ -+ xcalibrate_client = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; -+ } -+} -+ -+void -+XCalibrateExtensionInit(void) -+{ -+ ExtensionEntry *extEntry; -+ -+ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0)) -+ return; -+ -+ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors, -+ ProcXCalibrateDispatch, SProcXCalibrateDispatch, -+ XCalibrateResetProc, StandardMinorOpcode); -+ -+ if (!extEntry) -+ return; -+ -+ XCalibrateReqCode = (unsigned char)extEntry->base; -+ XCalibrateEventBase = extEntry->eventBase; -+ XCalibrateErrorBase = extEntry->errorBase; -+ -+ xcalibrate_client = 0; -+} diff --git a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch deleted file mode 100644 index ce80a7e389..0000000000 --- a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch +++ /dev/null @@ -1,44 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch -+++ xserver/hw/kdrive/fbdev/fbdev.c -@@ -190,6 +190,7 @@ - var.nonstd = 0; - var.grayscale = 0; - -+ /* commented out for poodle - k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); - - if (k < 0) -@@ -198,10 +199,11 @@ - return FALSE; - } - -- /* Re-get the "fixed" parameters since they might have changed */ -+ // Re-get the "fixed" parameters since they might have changed - k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); - if (k < 0) - perror ("FBIOGET_FSCREENINFO"); -+ */ - - /* Now get the new screeninfo */ - ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); -@@ -659,13 +661,14 @@ - priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL; - - /* display it on the LCD */ -+ /* commented out for poodle - k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var); - if (k < 0) - { - perror ("FBIOPUT_VSCREENINFO"); - return FALSE; - } -- -+ */ - if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR) - { - struct fb_cmap cmap; diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb deleted file mode 100644 index 21529a69d9..0000000000 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ /dev/null @@ -1,74 +0,0 @@ -PV = "0.0+cvs${FIXEDSRCDATE}" -FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -DEFAULT_PREFERENCE = "1" - -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" - -# Uncomment the following DEPENDS line and the commented line in SRC_URI -# to make this snapshot build against X11R7.0 xlibs. -#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" - -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "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" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -PR = "r11" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ -# file://build-20050207-against-X11R7.diff;patch=1 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 " - -SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ - file://kmode.patch;patch=1 \ - file://faster-rotated.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 " - - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ - file://faster-rotated.patch;patch=1 \ - file://devfs.patch;patch=1" -SRC_URI_append_collie = " file://faster-rotated.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \ - file://faster-rotated.patch;patch=1" -SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1" -SRC_URI_append_akita = " file://faster-rotated.patch;patch=1" - -PACKAGE_ARCH_mnci = "mnci" -PACKAGE_ARCH_collie = "collie" -PACKAGE_ARCH_poodle = "poodle" -PACKAGE_ARCH_h3600 = "h3600" -PACKAGE_ARCH_spitz = "spitz" -PACKAGE_ARCH_akita = "akita" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -LDFLAGS += " -lXfont -lXdmcp -lXau " -EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb deleted file mode 100644 index c2e44f7837..0000000000 --- a/packages/xserver/xserver-kdrive_20050624.bb +++ /dev/null @@ -1,49 +0,0 @@ -PV = "0.0+cvs${FIXEDSRCDATE}" -FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" - -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "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" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -PR = "r12" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \ - file://kmode.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb deleted file mode 100644 index e5101a3579..0000000000 --- a/packages/xserver/xserver-kdrive_20060312.bb +++ /dev/null @@ -1,52 +0,0 @@ -PV = "0.0+cvs${FIXEDSRCDATE}" -FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -DEFAULT_PREFERENCE = "1" - -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "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" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -PR = "r11" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb deleted file mode 100644 index 103185289c..0000000000 --- a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" - -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - -S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --with-default-font-path=built-ins \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb deleted file mode 100644 index 1c841cabf7..0000000000 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ /dev/null @@ -1,51 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -DEFAULT_PREFERENCE = "-2" - -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "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" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" -DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" -DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" -DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" -DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" -DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -PR = "r11" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-ati = "${bindir}/Xati" -FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" -FILES_xserver-kdrive-via = "${bindir}/Xvia" -FILES_xserver-kdrive-mga = "${bindir}/Xmga" -FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-i810 = "${bindir}/Xi810" -FILES_xserver-kdrive-epson = "${bindir}/Xepson" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - -S = "${WORKDIR}/xserver" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --disable-xinerama" diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xserver/xserver-kdrive_git.bb deleted file mode 100644 index 1f42cc159c..0000000000 --- a/packages/xserver/xserver-kdrive_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -PV = "0.0+git" -DEFAULT_PREFERENCE = "-2" - -LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" - -PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" -PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" -SECTION = "x11/base" -DESCRIPTION = "X server from freedesktop.org" -DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" -DESCRIPTION_xserver-kdrive-fake = "Fake X server" -DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" - -FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" -FILES_xserver-kdrive-fake = "${bindir}/Xfake" -FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" - -SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ - file://kmode.patch;patch=1 \ - file://disable-apm.patch;patch=1 \ - file://no-serial-probing.patch;patch=1 \ - file://kdrive-evdev.patch;patch=1 \ - file://kdrive-use-evdev.patch;patch=1 \ - file://fbdev-not-fix.patch;patch=1 \ - file://enable-builtin-fonts.patch;patch=1 \ - file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.patch;patch=1" - -SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -PACKAGE_ARCH_poodle = "poodle" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-composite --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --with-default-font-path=built-ins \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xserver/xserver-xorg/.mtn2git_empty b/packages/xserver/xserver-xorg/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xserver/xserver-xorg/dri.patch b/packages/xserver/xserver-xorg/dri.patch deleted file mode 100644 index 37d0407fe4..0000000000 --- a/packages/xserver/xserver-xorg/dri.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100 -+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100 -@@ -38,7 +38,6 @@ - #define _DRM_H_ - - #if defined(__linux__) --#include - #include /* For _IO* macros */ - #define DRM_IOCTL_NR(n) _IOC_NR(n) - #define DRM_IOC_VOID _IOC_NONE diff --git a/packages/xserver/xserver-xorg/fontfile.patch b/packages/xserver/xserver-xorg/fontfile.patch deleted file mode 100644 index ed39bf45d0..0000000000 --- a/packages/xserver/xserver-xorg/fontfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100 -+++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100 -@@ -14,7 +14,7 @@ - #endif - - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \ -- -I$(INCLUDESRC) -+ -I$(INCLUDESRC) $(CC_STAGING) - HEADERS = - #ifdef FontFormatDefines - FORMAT_DEFS = FontFormatDefines diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xserver/xserver-xorg/freetype.patch deleted file mode 100644 index 0ba3dd5627..0000000000 --- a/packages/xserver/xserver-xorg/freetype.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100 -+++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100 -@@ -20,7 +20,7 @@ - - INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/include $(EXTRAINCLUDES) \ -- -I$(INCLUDESRC) -+ -I$(INCLUDESRC) $(CC_STAGING) - - SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c - OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o ---- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100 -@@ -3371,7 +3371,7 @@ - - #if BuildFreetype2Library || HasFreetype2 - #if Freetype2IncDirStandard --FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config -+FREETYPE2INCLUDES = `pkg-config --cflags freetype2` - #else - FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config - #endif diff --git a/packages/xserver/xserver-xorg/imake-installed.patch b/packages/xserver/xserver-xorg/imake-installed.patch deleted file mode 100644 index 57821075ef..0000000000 --- a/packages/xserver/xserver-xorg/imake-installed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100 -@@ -2058,7 +2058,7 @@ - * INCLUDES contains client-specific includes set in Imakefile - * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile - */ -- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) -+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) diff --git a/packages/xserver/xserver-xorg/imake-staging.patch b/packages/xserver/xserver-xorg/imake-staging.patch deleted file mode 100644 index bf2e350830..0000000000 --- a/packages/xserver/xserver-xorg/imake-staging.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 -@@ -2038,11 +2038,11 @@ - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib $(INSTALLED_LIBS) - LDPOSTLIB = LdPostLib -- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) - CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) ---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 -+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 -@@ -114,7 +114,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif ---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 -@@ -3359,7 +3359,7 @@ - FREETYPE2LIBDIR = Freetype2LibDir - FREETYPE2INCDIR = Freetype2IncDir - #if Freetype2LibDirStandard --FREETYPE2LIB = -lfreetype -+FREETYPE2LIB = $(LD_STAGING) -lfreetype - #else - FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype - #endif diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb deleted file mode 100644 index 37546fe1ee..0000000000 --- a/packages/xserver/xserver-xorg_6.8.99.10.bb +++ /dev/null @@ -1,65 +0,0 @@ -SECTION = "x11/base" -RPROVIDES = "virtual/xserver" -PROVIDES = "virtual/xserver" -LICENSE = "Xorg" -PR = "r2" - -DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \ - file://imake-staging.patch;patch=1 \ - file://imake-installed.patch;patch=1 \ - file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ - file://dri.patch;patch=1" - -PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" - -S = "${WORKDIR}/xc" - -FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" -FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" -FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" -FILES_${PN}-doc += "${libdir}/X11/doc" - -do_configure() { - cat < config/cf/host.def -#define BuildServersOnly YES -#define ProjectRoot ${prefix} -#define XnestServer NO -#define XdmxServer NO -#define CcCmd gcc -#define LdCmd ld -#define HasFreetype2 YES -#define HasFontconfig YES -#define BuildDevelDRIDrivers YES -#define BuildXF86DRI YES -EOF - echo "" > config/cf/date.def - rm -f include/extensions/panoramiX.h - make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake - make CC="${BUILD_CC}" xmakefile - make Makefiles - make clean -} - -do_compile() { - #make depend - make includes - make -C config/util CC="${BUILD_CC}" - for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done - make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" -} - -do_install() { - make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install - make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install -} - -do_stage() { - install -d ${STAGING_INCDIR}/xserver-xorg - for i in i810 via; do - pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd - done - install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ -} diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xserver/xserver-xorg_6.8.99.11.bb deleted file mode 100644 index e60f62ef57..0000000000 --- a/packages/xserver/xserver-xorg_6.8.99.11.bb +++ /dev/null @@ -1,65 +0,0 @@ -SECTION = "x11/base" -RPROVIDES = "virtual/xserver" -PROVIDES = "virtual/xserver" -LICENSE = "Xorg" -PR = "r0" - -DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \ - file://imake-staging.patch;patch=1 \ - file://imake-installed.patch;patch=1 \ - file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ - file://dri.patch;patch=1" - -PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" - -S = "${WORKDIR}/xc" - -FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" -FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" -FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" -FILES_${PN}-doc += "${libdir}/X11/doc" - -do_configure() { - cat < config/cf/host.def -#define BuildServersOnly YES -#define ProjectRoot ${prefix} -#define XnestServer NO -#define XdmxServer NO -#define CcCmd gcc -#define LdCmd ld -#define HasFreetype2 YES -#define HasFontconfig YES -#define BuildDevelDRIDrivers YES -#define BuildXF86DRI YES -EOF - echo "" > config/cf/date.def - rm -f include/extensions/panoramiX.h - make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake - make CC="${BUILD_CC}" xmakefile - make Makefiles - make clean -} - -do_compile() { - #make depend - make includes - make -C config/util CC="${BUILD_CC}" - for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done - make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" -} - -do_install() { - make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install - make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install -} - -do_stage() { - install -d ${STAGING_INCDIR}/xserver-xorg - for i in i810 via; do - pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd - done - install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ -} diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xserver/xserver-xorg_cvs.bb deleted file mode 100644 index e410581e17..0000000000 --- a/packages/xserver/xserver-xorg_cvs.bb +++ /dev/null @@ -1,61 +0,0 @@ -SECTION = "x11/base" -LICENSE = "Xorg" -RPROVIDES = "virtual/xserver" -PROVIDES = "virtual/xserver" -PR = "r3" -PV = "6.8.1+cvs${SRCDATE}" - -DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \ - file://imake-staging.patch;patch=1 \ - file://dri.patch;patch=1" - -PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" - -S = "${WORKDIR}/xc" - -FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print" -FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" -FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" -FILES_${PN}-doc += "${libdir}/X11/doc" - -do_configure() { - echo "#define BuildServersOnly YES" > config/cf/host.def - echo "#define ProjectRoot /usr" >> config/cf/host.def - echo "#define XnestServer NO" >> config/cf/host.def - echo "#define XdmxServer NO" >> config/cf/host.def - echo "#define CcCmd ${CC}" >> config/cf/host.def - echo "#define LdCmd ${LD}" >> config/cf/host.def - echo "#define HasFreetype2 YES" >> config/cf/host.def - echo "#define HasFontconfig YES" >> config/cf/host.def - echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def - echo "" > config/cf/date.def - rm -f include/extensions/panoramiX.h -} - -do_compile() { - make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake - make CC="${BUILD_CC}" xmakefile - make Makefiles - make clean - #make depend - make includes - make -C config/util CC="${BUILD_CC}" - for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done - make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" -} - -do_install() { - make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install - make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install -} - -do_stage() { - install -d ${STAGING_INCDIR}/xserver-xorg - for i in i810 via; do - pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd - done - install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ -} diff --git a/packages/xset/xset/.mtn2git_empty b/packages/xset/xset/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xset/xset/autofoo.patch b/packages/xset/xset/autofoo.patch deleted file mode 100644 index 039d1319e3..0000000000 --- a/packages/xset/xset/autofoo.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -urN xset.orig/Makefile.am xset/Makefile.am ---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XSET_CFLAGS@ -+ -+bin_PROGRAMS = xset -+ -+xset_SOURCES = xset.c -+ -+xset_LDADD = @XSET_LIBS@ -+ -+man5_MANS=xset.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xset.orig/autogen.sh xset/autogen.sh ---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200 -@@ -0,0 +1,3 @@ -+#! /bin/sh -+autoreconf -v --install || exit 1 -+./configure --enable-maintainer-mode "$@" -diff -urN xset.orig/configure.ac xset/configure.ac ---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200 -@@ -0,0 +1,41 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xset],4.4.0,[],xset) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11) -+ -+AC_OUTPUT([Makefile]) diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xset/xset/disable-xkb.patch deleted file mode 100644 index 6060fbb995..0000000000 --- a/packages/xset/xset/disable-xkb.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100 -+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100 -@@ -42,11 +42,15 @@ - AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) - -+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]), -+ XKB="$enableval", XKB="yes") -+if test "x$XKB" = "xyes" ; then - PKG_CHECK_MODULES(SET_XKB, x11, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" - AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -+fi - - PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, - [SAVE_CPPFLAGS="$CPPFLAGS" diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb deleted file mode 100644 index 55f3a0de21..0000000000 --- a/packages/xset/xset_1.0.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "user preference utility for X" -LICENSE = "MIT" -MAINTAINER = "Florian Boor " - -DEPENDS = "libx11 libxext xextproto libxmu" - -CFLAGS += "-D_GNU_SOURCE" - -SECTION = "x11/base" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \ - file://disable-xkb.patch;patch=1" -S = "${WORKDIR}/${PN}-X11R7.0-${PV}" - -EXTRA_OECONF = "--disable-xkb" - -inherit autotools pkgconfig diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb deleted file mode 100644 index daf57d15c8..0000000000 --- a/packages/xset/xset_20040817.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "user preference utility for X" -LICENSE = "MIT" -MAINTAINER = "Florian Boor " -FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" -PV = "0.0+cvs${FIXEDSRCDATE}" -PR = "r1" - -DEPENDS = "libx11 libxext xextensions libxmu" - -CFLAGS += "-D_GNU_SOURCE" - -SECTION = "x11/base" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xset" - -inherit autotools pkgconfig -- cgit v1.2.3