From 4cb58790daad0b069c93158c4270d2367e3fa100 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Feb 2010 00:29:41 +0000 Subject: xorg: Bulk version upgrades Signed-off-by: Richard Purdie --- .../conf/distro/include/moblin-fixed-revisions.inc | 8 +- .../distro/include/preferred-xorg-versions.inc | 128 ++++++++++----------- meta/packages/drm/libdrm-2.4.15/installtests.patch | 39 ------- meta/packages/drm/libdrm-2.4.16/installtests.patch | 39 +++++++ meta/packages/drm/libdrm_2.4.15.bb | 4 - meta/packages/drm/libdrm_2.4.16.bb | 4 + meta/packages/xorg-app/mkfontdir_1.0.5.bb | 9 ++ meta/packages/xorg-app/mkfontscale_1.0.7.bb | 7 ++ .../packages/xorg-driver/xf86-input-evdev_2.2.1.bb | 4 - .../packages/xorg-driver/xf86-input-evdev_2.3.2.bb | 4 + .../xorg-driver/xf86-input-keyboard_1.3.2.bb | 4 - .../xorg-driver/xf86-input-keyboard_1.4.0.bb | 4 + .../packages/xorg-driver/xf86-input-mouse_1.4.0.bb | 4 - .../packages/xorg-driver/xf86-input-mouse_1.5.0.bb | 4 + .../xorg-driver/xf86-input-synaptics_1.1.0.bb | 4 - .../xorg-driver/xf86-input-synaptics_1.2.1.bb | 5 + .../xorg-driver/xf86-input-synaptics_git.bb | 1 + .../xorg-driver/xf86-input-vmmouse_12.6.4.bb | 8 -- .../xorg-driver/xf86-input-vmmouse_12.6.5.bb | 8 ++ .../xorg-driver/xf86-video-vmware_10.16.5.bb | 7 -- .../xorg-driver/xf86-video-vmware_10.16.9.bb | 7 ++ meta/packages/xorg-font/encodings_1.0.3.bb | 5 + meta/packages/xorg-font/font-alias_1.0.2.bb | 9 ++ meta/packages/xorg-font/font-util_1.1.1.bb | 17 +++ meta/packages/xorg-font/xorg-font-common.inc | 45 ++++++++ meta/packages/xorg-lib/libdmx_1.0.2.bb | 6 - meta/packages/xorg-lib/libdmx_1.1.0.bb | 6 + meta/packages/xorg-lib/libx11-diet_1.2.1.bb | 17 --- meta/packages/xorg-lib/libx11-diet_1.3.bb | 17 +++ meta/packages/xorg-lib/libx11-trim_1.2.1.bb | 11 -- meta/packages/xorg-lib/libx11-trim_1.3.bb | 11 ++ meta/packages/xorg-lib/libx11_1.2.1.bb | 15 --- meta/packages/xorg-lib/libx11_1.3.bb | 15 +++ meta/packages/xorg-lib/libxext_1.0.5.bb | 10 -- meta/packages/xorg-lib/libxext_1.1.1.bb | 10 ++ meta/packages/xorg-lib/libxi_1.2.1.bb | 8 -- meta/packages/xorg-lib/libxi_1.3.bb | 8 ++ meta/packages/xorg-lib/libxi_git.bb | 2 +- meta/packages/xorg-lib/libxinerama_1.0.3.bb | 9 -- meta/packages/xorg-lib/libxinerama_1.1.bb | 9 ++ meta/packages/xorg-lib/libxtst_1.0.3.bb | 9 -- meta/packages/xorg-lib/libxtst_1.1.0.bb | 9 ++ meta/packages/xorg-lib/libxxf86dga_1.0.2.bb | 8 -- meta/packages/xorg-lib/libxxf86dga_1.1.1.bb | 8 ++ meta/packages/xorg-lib/pixman_0.13.2.bb | 4 - meta/packages/xorg-lib/pixman_0.17.4.bb | 4 + meta/packages/xorg-proto/applewmproto_1.1.0.bb | 4 - meta/packages/xorg-proto/applewmproto_1.4.1.bb | 4 + meta/packages/xorg-proto/bigreqsproto_1.0.2.bb | 8 -- meta/packages/xorg-proto/bigreqsproto_1.1.0.bb | 8 ++ meta/packages/xorg-proto/damageproto_1.1.0.bb | 5 - meta/packages/xorg-proto/damageproto_1.2.0.bb | 5 + meta/packages/xorg-proto/dmxproto_2.2.2.bb | 4 - meta/packages/xorg-proto/dmxproto_2.3.bb | 4 + meta/packages/xorg-proto/dri2proto_1.99.3.bb | 5 - meta/packages/xorg-proto/dri2proto_2.2.bb | 5 + meta/packages/xorg-proto/evieext_1.0.2.bb | 4 - meta/packages/xorg-proto/evieext_1.1.0.bb | 4 + meta/packages/xorg-proto/fixesproto_4.0.bb | 7 -- meta/packages/xorg-proto/fixesproto_4.1.1.bb | 7 ++ meta/packages/xorg-proto/fontcacheproto_0.1.2.bb | 6 - meta/packages/xorg-proto/fontcacheproto_0.1.3.bb | 6 + meta/packages/xorg-proto/fontsproto_2.0.2.bb | 6 - meta/packages/xorg-proto/fontsproto_2.1.0.bb | 6 + meta/packages/xorg-proto/glproto_1.4.11.bb | 6 + meta/packages/xorg-proto/glproto_1.4.9.bb | 6 - meta/packages/xorg-proto/inputproto_1.9.99.12.bb | 8 -- meta/packages/xorg-proto/inputproto_2.0.bb | 8 ++ meta/packages/xorg-proto/kbproto_1.0.3.bb | 8 -- meta/packages/xorg-proto/kbproto_1.0.4.bb | 8 ++ meta/packages/xorg-proto/randrproto_1.2.99.3.bb | 7 -- meta/packages/xorg-proto/randrproto_1.3.1.bb | 7 ++ meta/packages/xorg-proto/recordproto_1.13.2.bb | 5 - meta/packages/xorg-proto/recordproto_1.14.bb | 5 + meta/packages/xorg-proto/renderproto_0.11.bb | 7 ++ meta/packages/xorg-proto/renderproto_0.9.3.bb | 7 -- meta/packages/xorg-proto/resourceproto_1.0.2.bb | 5 - meta/packages/xorg-proto/resourceproto_1.1.0.bb | 5 + meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb | 4 - meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb | 4 + meta/packages/xorg-proto/videoproto_2.2.2.bb | 4 - meta/packages/xorg-proto/videoproto_2.3.0.bb | 4 + meta/packages/xorg-proto/windowswmproto_1.0.3.bb | 4 - meta/packages/xorg-proto/windowswmproto_1.0.4.bb | 4 + meta/packages/xorg-proto/xcmiscproto_1.1.2.bb | 8 -- meta/packages/xorg-proto/xcmiscproto_1.2.0.bb | 8 ++ meta/packages/xorg-proto/xextproto_7.0.5.bb | 8 -- meta/packages/xorg-proto/xextproto_7.1.0.bb | 8 ++ meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb | 8 -- meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb | 8 ++ meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb | 5 - meta/packages/xorg-proto/xf86dgaproto_2.1.bb | 5 + meta/packages/xorg-proto/xf86driproto_2.0.4.bb | 4 - meta/packages/xorg-proto/xf86driproto_2.1.0.bb | 4 + meta/packages/xorg-proto/xf86miscproto_0.9.2.bb | 4 - meta/packages/xorg-proto/xf86miscproto_0.9.3.bb | 4 + meta/packages/xorg-proto/xineramaproto_1.1.2.bb | 4 - meta/packages/xorg-proto/xineramaproto_1.2.bb | 4 + meta/packages/xorg-proto/xproto_7.0.14.bb | 6 - meta/packages/xorg-proto/xproto_7.0.16.bb | 6 + .../xorg-proto/xproxymanagementprotocol_1.0.2.bb | 5 - .../xorg-proto/xproxymanagementprotocol_1.0.3.bb | 5 + .../xserver-xf86-dri-lite/crosscompile.patch | 19 +++ .../xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb | 18 +++ 104 files changed, 530 insertions(+), 399 deletions(-) delete mode 100644 meta/packages/drm/libdrm-2.4.15/installtests.patch create mode 100644 meta/packages/drm/libdrm-2.4.16/installtests.patch delete mode 100644 meta/packages/drm/libdrm_2.4.15.bb create mode 100644 meta/packages/drm/libdrm_2.4.16.bb create mode 100644 meta/packages/xorg-app/mkfontdir_1.0.5.bb create mode 100644 meta/packages/xorg-app/mkfontscale_1.0.7.bb delete mode 100644 meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb create mode 100644 meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb delete mode 100644 meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb create mode 100644 meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb delete mode 100644 meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb create mode 100644 meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb delete mode 100644 meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb create mode 100644 meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb delete mode 100644 meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb create mode 100644 meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb delete mode 100644 meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb create mode 100644 meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb create mode 100644 meta/packages/xorg-font/encodings_1.0.3.bb create mode 100644 meta/packages/xorg-font/font-alias_1.0.2.bb create mode 100644 meta/packages/xorg-font/font-util_1.1.1.bb create mode 100644 meta/packages/xorg-font/xorg-font-common.inc delete mode 100644 meta/packages/xorg-lib/libdmx_1.0.2.bb create mode 100644 meta/packages/xorg-lib/libdmx_1.1.0.bb delete mode 100644 meta/packages/xorg-lib/libx11-diet_1.2.1.bb create mode 100644 meta/packages/xorg-lib/libx11-diet_1.3.bb delete mode 100644 meta/packages/xorg-lib/libx11-trim_1.2.1.bb create mode 100644 meta/packages/xorg-lib/libx11-trim_1.3.bb delete mode 100644 meta/packages/xorg-lib/libx11_1.2.1.bb create mode 100644 meta/packages/xorg-lib/libx11_1.3.bb delete mode 100644 meta/packages/xorg-lib/libxext_1.0.5.bb create mode 100644 meta/packages/xorg-lib/libxext_1.1.1.bb delete mode 100644 meta/packages/xorg-lib/libxi_1.2.1.bb create mode 100644 meta/packages/xorg-lib/libxi_1.3.bb delete mode 100644 meta/packages/xorg-lib/libxinerama_1.0.3.bb create mode 100644 meta/packages/xorg-lib/libxinerama_1.1.bb delete mode 100644 meta/packages/xorg-lib/libxtst_1.0.3.bb create mode 100644 meta/packages/xorg-lib/libxtst_1.1.0.bb delete mode 100644 meta/packages/xorg-lib/libxxf86dga_1.0.2.bb create mode 100644 meta/packages/xorg-lib/libxxf86dga_1.1.1.bb delete mode 100644 meta/packages/xorg-lib/pixman_0.13.2.bb create mode 100644 meta/packages/xorg-lib/pixman_0.17.4.bb delete mode 100644 meta/packages/xorg-proto/applewmproto_1.1.0.bb create mode 100644 meta/packages/xorg-proto/applewmproto_1.4.1.bb delete mode 100644 meta/packages/xorg-proto/bigreqsproto_1.0.2.bb create mode 100644 meta/packages/xorg-proto/bigreqsproto_1.1.0.bb delete mode 100644 meta/packages/xorg-proto/damageproto_1.1.0.bb create mode 100644 meta/packages/xorg-proto/damageproto_1.2.0.bb delete mode 100644 meta/packages/xorg-proto/dmxproto_2.2.2.bb create mode 100644 meta/packages/xorg-proto/dmxproto_2.3.bb delete mode 100644 meta/packages/xorg-proto/dri2proto_1.99.3.bb create mode 100644 meta/packages/xorg-proto/dri2proto_2.2.bb delete mode 100644 meta/packages/xorg-proto/evieext_1.0.2.bb create mode 100644 meta/packages/xorg-proto/evieext_1.1.0.bb delete mode 100644 meta/packages/xorg-proto/fixesproto_4.0.bb create mode 100644 meta/packages/xorg-proto/fixesproto_4.1.1.bb delete mode 100644 meta/packages/xorg-proto/fontcacheproto_0.1.2.bb create mode 100644 meta/packages/xorg-proto/fontcacheproto_0.1.3.bb delete mode 100644 meta/packages/xorg-proto/fontsproto_2.0.2.bb create mode 100644 meta/packages/xorg-proto/fontsproto_2.1.0.bb create mode 100644 meta/packages/xorg-proto/glproto_1.4.11.bb delete mode 100644 meta/packages/xorg-proto/glproto_1.4.9.bb delete mode 100644 meta/packages/xorg-proto/inputproto_1.9.99.12.bb create mode 100644 meta/packages/xorg-proto/inputproto_2.0.bb delete mode 100644 meta/packages/xorg-proto/kbproto_1.0.3.bb create mode 100644 meta/packages/xorg-proto/kbproto_1.0.4.bb delete mode 100644 meta/packages/xorg-proto/randrproto_1.2.99.3.bb create mode 100644 meta/packages/xorg-proto/randrproto_1.3.1.bb delete mode 100644 meta/packages/xorg-proto/recordproto_1.13.2.bb create mode 100644 meta/packages/xorg-proto/recordproto_1.14.bb create mode 100644 meta/packages/xorg-proto/renderproto_0.11.bb delete mode 100644 meta/packages/xorg-proto/renderproto_0.9.3.bb delete mode 100644 meta/packages/xorg-proto/resourceproto_1.0.2.bb create mode 100644 meta/packages/xorg-proto/resourceproto_1.1.0.bb delete mode 100644 meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb create mode 100644 meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb delete mode 100644 meta/packages/xorg-proto/videoproto_2.2.2.bb create mode 100644 meta/packages/xorg-proto/videoproto_2.3.0.bb delete mode 100644 meta/packages/xorg-proto/windowswmproto_1.0.3.bb create mode 100644 meta/packages/xorg-proto/windowswmproto_1.0.4.bb delete mode 100644 meta/packages/xorg-proto/xcmiscproto_1.1.2.bb create mode 100644 meta/packages/xorg-proto/xcmiscproto_1.2.0.bb delete mode 100644 meta/packages/xorg-proto/xextproto_7.0.5.bb create mode 100644 meta/packages/xorg-proto/xextproto_7.1.0.bb delete mode 100644 meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb create mode 100644 meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb delete mode 100644 meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb create mode 100644 meta/packages/xorg-proto/xf86dgaproto_2.1.bb delete mode 100644 meta/packages/xorg-proto/xf86driproto_2.0.4.bb create mode 100644 meta/packages/xorg-proto/xf86driproto_2.1.0.bb delete mode 100644 meta/packages/xorg-proto/xf86miscproto_0.9.2.bb create mode 100644 meta/packages/xorg-proto/xf86miscproto_0.9.3.bb delete mode 100644 meta/packages/xorg-proto/xineramaproto_1.1.2.bb create mode 100644 meta/packages/xorg-proto/xineramaproto_1.2.bb delete mode 100644 meta/packages/xorg-proto/xproto_7.0.14.bb create mode 100644 meta/packages/xorg-proto/xproto_7.0.16.bb delete mode 100644 meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb create mode 100644 meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb create mode 100644 meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch create mode 100644 meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index 4faecb6630..a721158196 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc @@ -10,13 +10,13 @@ PREFERRED_VERSION_pango = "1.26.0" PREFERRED_VERSION_udev ?= "145" PREFERRED_VERSION_mesa-dri ?= "7.7" -PREFERRED_VERSION_xf86-video-intel ?= "2.7.1" -PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" +PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2" PREFERRED_VERSION_libxcb ?= "1.3" PREFERRED_VERSION_xcb-proto ?= "1.5" -PREFERRED_VERSION_libx11-trim ?= "1.2.1" +PREFERRED_VERSION_libx11-trim ?= "1.3" -PREFERRED_VERSION_libdrm ?= "2.4.15" +PREFERRED_VERSION_libdrm ?= "2.4.16" PREFERRED_VERSION_xf86-input-keyboard ?= "" PREFERRED_VERSION_dri2proto ?= "" diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 7e269cd9cb..45a37a2d0f 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -2,30 +2,30 @@ # The latest Xorg package versions # -PREFERRED_VERSION_applewmproto ?= "1.1.0" -PREFERRED_VERSION_bigreqsproto ?= "1.0.2" -PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2" -PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.0.2" +PREFERRED_VERSION_applewmproto ?= "1.4.1" +PREFERRED_VERSION_bigreqsproto ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" +PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.0" PREFERRED_VERSION_compositeproto ?= "0.4" -PREFERRED_VERSION_damageproto ?= "1.1.0" -PREFERRED_VERSION_dmxproto ?= "2.2.2" -PREFERRED_VERSION_evieext ?= "1.0.2" -PREFERRED_VERSION_fixesproto ?= "4.0" -PREFERRED_VERSION_fontcacheproto ?= "0.1.2" -PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2" -PREFERRED_VERSION_fontsproto ?= "2.0.2" -PREFERRED_VERSION_fontsproto-native ?= "2.0.2" +PREFERRED_VERSION_damageproto ?= "1.2.0" +PREFERRED_VERSION_dmxproto ?= "2.3" +PREFERRED_VERSION_evieext ?= "1.1.0" +PREFERRED_VERSION_fixesproto ?= "4.1.1" +PREFERRED_VERSION_fontcacheproto ?= "0.1.3" +PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" +PREFERRED_VERSION_fontsproto ?= "2.1.0" +PREFERRED_VERSION_fontsproto-native ?= "2.1.0" PREFERRED_VERSION_gccmakedep ?= "1.0.2" -PREFERRED_VERSION_glproto ?= "1.4.9" +PREFERRED_VERSION_glproto ?= "1.4.11" PREFERRED_VERSION_imake ?= "1.0.2" -#PREFERRED_VERSION_inputproto ?= "1.9.99.12" -#PREFERRED_VERSION_inputproto-native ?= "1.9.99.12" -#PREFERRED_VERSION_inputproto-nativesdk ?= "1.9.99.12" -PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_kbproto-native ?= "1.0.3" -PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.3" +#PREFERRED_VERSION_inputproto ?= "2.0" +#PREFERRED_VERSION_inputproto-native ?= "2.0" +#PREFERRED_VERSION_inputproto-nativesdk ?= "2.0" +PREFERRED_VERSION_kbproto ?= "1.0.4" +PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.4" PREFERRED_VERSION_libapplewm ?= "1.0.0" -PREFERRED_VERSION_libdmx ?= "1.0.2" +PREFERRED_VERSION_libdmx ?= "1.1.0" PREFERRED_VERSION_libfontenc ?= "1.0.4" PREFERRED_VERSION_libfontenc-native ?= "1.0.4" PREFERRED_VERSION_libfs ?= "1.0.1" @@ -34,11 +34,11 @@ PREFERRED_VERSION_liblbxutil ?= "1.0.1" PREFERRED_VERSION_liboldx ?= "1.0.1" PREFERRED_VERSION_libsm ?= "1.1.0" PREFERRED_VERSION_libwindowswm ?= "1.0.0" -PREFERRED_VERSION_libx11 ?= "1.2.1" -PREFERRED_VERSION_libx11-diet ?= "1.2.1" -PREFERRED_VERSION_libx11-native ?= "1.2.1" -PREFERRED_VERSION_libx11-nativesdk ?= "1.2.1" -PREFERRED_VERSION_libx11-trim ?= "1.2.1" +PREFERRED_VERSION_libx11 ?= "1.3" +PREFERRED_VERSION_libx11-diet ?= "1.3" +PREFERRED_VERSION_libx11-native ?= "1.3" +PREFERRED_VERSION_libx11-nativesdk ?= "1.3" +PREFERRED_VERSION_libx11-trim ?= "1.3" PREFERRED_VERSION_libxau ?= "1.0.4" PREFERRED_VERSION_libxau-native ?= "1.0.4" PREFERRED_VERSION_libxau-nativesdk ?= "1.0.4" @@ -50,15 +50,15 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2" PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.2" PREFERRED_VERSION_libxevie ?= "1.0.2" -#PREFERRED_VERSION_libxext ?= "1.0.5" -PREFERRED_VERSION_libxext-nativesdk ?= "1.0.5" +PREFERRED_VERSION_libxext ?= "1.1.1" +PREFERRED_VERSION_libxext-nativesdk ?= "1.1.1" PREFERRED_VERSION_libxfixes ?= "4.0.3" PREFERRED_VERSION_libxfont ?= "1.3.4" PREFERRED_VERSION_libxfont-native ?= "1.3.4" PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxft ?= "2.1.13" -#PREFERRED_VERSION_libxi ?= "1.2.1" -PREFERRED_VERSION_libxinerama ?= "1.0.3" +PREFERRED_VERSION_libxi ?= "1.3" +PREFERRED_VERSION_libxinerama ?= "1.1" PREFERRED_VERSION_libxkbfile ?= "1.0.5" PREFERRED_VERSION_libxkbui ?= "1.0.2" PREFERRED_VERSION_libxmu ?= "1.0.4" @@ -74,58 +74,58 @@ PREFERRED_VERSION_libxres ?= "1.0.3" PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" PREFERRED_VERSION_libxt ?= "1.0.5" PREFERRED_VERSION_libxtrap ?= "1.0.0" -PREFERRED_VERSION_libxtst ?= "1.0.3" +PREFERRED_VERSION_libxtst ?= "1.1.0" PREFERRED_VERSION_libxv ?= "1.0.4" PREFERRED_VERSION_libxvmc ?= "1.0.4" -PREFERRED_VERSION_libxxf86dga ?= "1.0.2" +PREFERRED_VERSION_libxxf86dga ?= "1.1.1" PREFERRED_VERSION_libxxf86misc ?= "1.0.1" PREFERRED_VERSION_libxxf86vm ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.1" PREFERRED_VERSION_makedepend-native ?= "1.0.1" -PREFERRED_VERSION_pixman ?= "0.13.2" +PREFERRED_VERSION_pixman ?= "0.17.4" PREFERRED_VERSION_printproto ?= "1.0.4" -PREFERRED_VERSION_randrproto ?= "1.2.99.3" -PREFERRED_VERSION_randrproto-nativesdk ?= "1.2.99.3" -PREFERRED_VERSION_recordproto ?= "1.13.2" -PREFERRED_VERSION_renderproto ?= "0.9.3" -PREFERRED_VERSION_renderproto-nativesdk ?= "0.9.3" -PREFERRED_VERSION_resourceproto ?= "1.0.2" -PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" +PREFERRED_VERSION_randrproto ?= "1.3.1" +PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.1" +PREFERRED_VERSION_recordproto ?= "1.14" +PREFERRED_VERSION_renderproto ?= "0.11" +PREFERRED_VERSION_renderproto-nativesdk ?= "0.11" +PREFERRED_VERSION_resourceproto ?= "1.1.0" +PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" PREFERRED_VERSION_trapproto ?= "3.4.3" PREFERRED_VERSION_util-macros ?= "1.4.1" PREFERRED_VERSION_util-macros-native ?= "1.4.1" -PREFERRED_VERSION_videoproto ?= "2.2.2" -PREFERRED_VERSION_windowswmproto ?= "1.0.3" +PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_windowswmproto ?= "1.0.4" PREFERRED_VERSION_x11perf ?= "1.5" PREFERRED_VERSION_xauth ?= "1.0.3" -PREFERRED_VERSION_xcmiscproto ?= "1.1.2" -PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" -PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.1.2" +PREFERRED_VERSION_xcmiscproto ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" +PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.0" PREFERRED_VERSION_xdpyinfo ?= "1.0.3" PREFERRED_VERSION_xev ?= "1.0.3" -PREFERRED_VERSION_xextproto ?= "7.0.5" -PREFERRED_VERSION_xextproto-native ?= "7.0.5" -PREFERRED_VERSION_xextproto-nativesdk ?= "7.0.5" -PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" -PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" -PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.1.2" -PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xf86driproto ?= "2.0.4" +PREFERRED_VERSION_xextproto ?= "7.1.0" +PREFERRED_VERSION_xextproto-native ?= "7.1.0" +PREFERRED_VERSION_xextproto-nativesdk ?= "7.1.0" +PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" +PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.2.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.1" +PREFERRED_VERSION_xf86driproto ?= "2.1.0" PREFERRED_VERSION_dri2proto ?= "1.99.3" -PREFERRED_VERSION_xf86miscproto ?= "0.9.2" +PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" PREFERRED_VERSION_xhost ?= "1.0.2" PREFERRED_VERSION_xinit ?= "1.1.1" -PREFERRED_VERSION_xineramaproto ?= "1.1.2" +PREFERRED_VERSION_xineramaproto ?= "1.2" PREFERRED_VERSION_xmodmap ?= "1.0.3" PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xprop ?= "1.0.4" -PREFERRED_VERSION_xproto ?= "7.0.14" -PREFERRED_VERSION_xproto-native ?= "7.0.14" -PREFERRED_VERSION_xproto-nativesdk ?= "7.0.14" -PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" +PREFERRED_VERSION_xproto ?= "7.0.16" +PREFERRED_VERSION_xproto-native ?= "7.0.16" +PREFERRED_VERSION_xproto-nativesdk ?= "7.0.16" +PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" PREFERRED_VERSION_xrandr ?= "1.2.3" PREFERRED_VERSION_xrdb ?= "1.0.5" PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" @@ -137,15 +137,15 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2" PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.0.4" PREFERRED_VERSION_mesa-dri ?= "7.4" -PREFERRED_VERSION_libdrm ?= "2.4.7" +PREFERRED_VERSION_libdrm ?= "2.4.16" PREFERRED_VERSION_xcb-proto ?= "1.5" PREFERRED_VERSION_libxcb ?= "1.3" PREFERRED_VERSION_libxcb-nativesdk ?= "1.3" PREFERRED_VERSION_libpciaccess ?= "0.10.5" -PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1" -PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0" -PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2" -PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.7.1" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2" +PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" +PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" diff --git a/meta/packages/drm/libdrm-2.4.15/installtests.patch b/meta/packages/drm/libdrm-2.4.15/installtests.patch deleted file mode 100644 index a16c8a738b..0000000000 --- a/meta/packages/drm/libdrm-2.4.15/installtests.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: libdrm-2.4.7/tests/Makefile.am -=================================================================== ---- libdrm-2.4.7.orig/tests/Makefile.am 2009-04-09 20:16:35.000000000 +0100 -+++ libdrm-2.4.7/tests/Makefile.am 2009-04-17 12:35:14.000000000 +0100 -@@ -4,7 +4,7 @@ - - LDADD = $(top_builddir)/libdrm/libdrm.la - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - dristat \ - drmstat - -Index: libdrm-2.4.7/tests/modeprint/Makefile.am -=================================================================== ---- libdrm-2.4.7.orig/tests/modeprint/Makefile.am 2009-02-17 19:52:37.000000000 +0000 -+++ libdrm-2.4.7/tests/modeprint/Makefile.am 2009-04-17 12:35:32.000000000 +0100 -@@ -3,7 +3,7 @@ - -I$(top_srcdir)/libdrm/intel/ \ - -I$(top_srcdir)/libdrm - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modeprint - - modeprint_SOURCES = \ -Index: libdrm-2.4.7/tests/modetest/Makefile.am -=================================================================== ---- libdrm-2.4.7.orig/tests/modetest/Makefile.am 2009-02-17 19:52:37.000000000 +0000 -+++ libdrm-2.4.7/tests/modetest/Makefile.am 2009-04-17 12:35:42.000000000 +0100 -@@ -4,7 +4,7 @@ - -I$(top_srcdir)/libdrm \ - $(CAIRO_CFLAGS) - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - modetest - - modetest_SOURCES = \ diff --git a/meta/packages/drm/libdrm-2.4.16/installtests.patch b/meta/packages/drm/libdrm-2.4.16/installtests.patch new file mode 100644 index 0000000000..a16c8a738b --- /dev/null +++ b/meta/packages/drm/libdrm-2.4.16/installtests.patch @@ -0,0 +1,39 @@ +Index: libdrm-2.4.7/tests/Makefile.am +=================================================================== +--- libdrm-2.4.7.orig/tests/Makefile.am 2009-04-09 20:16:35.000000000 +0100 ++++ libdrm-2.4.7/tests/Makefile.am 2009-04-17 12:35:14.000000000 +0100 +@@ -4,7 +4,7 @@ + + LDADD = $(top_builddir)/libdrm/libdrm.la + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + dristat \ + drmstat + +Index: libdrm-2.4.7/tests/modeprint/Makefile.am +=================================================================== +--- libdrm-2.4.7.orig/tests/modeprint/Makefile.am 2009-02-17 19:52:37.000000000 +0000 ++++ libdrm-2.4.7/tests/modeprint/Makefile.am 2009-04-17 12:35:32.000000000 +0100 +@@ -3,7 +3,7 @@ + -I$(top_srcdir)/libdrm/intel/ \ + -I$(top_srcdir)/libdrm + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modeprint + + modeprint_SOURCES = \ +Index: libdrm-2.4.7/tests/modetest/Makefile.am +=================================================================== +--- libdrm-2.4.7.orig/tests/modetest/Makefile.am 2009-02-17 19:52:37.000000000 +0000 ++++ libdrm-2.4.7/tests/modetest/Makefile.am 2009-04-17 12:35:42.000000000 +0100 +@@ -4,7 +4,7 @@ + -I$(top_srcdir)/libdrm \ + $(CAIRO_CFLAGS) + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + modetest + + modetest_SOURCES = \ diff --git a/meta/packages/drm/libdrm_2.4.15.bb b/meta/packages/drm/libdrm_2.4.15.bb deleted file mode 100644 index 7679035866..0000000000 --- a/meta/packages/drm/libdrm_2.4.15.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libdrm.inc - -SRC_URI += "file://installtests.patch;patch=1" -PR = "r1" diff --git a/meta/packages/drm/libdrm_2.4.16.bb b/meta/packages/drm/libdrm_2.4.16.bb new file mode 100644 index 0000000000..7679035866 --- /dev/null +++ b/meta/packages/drm/libdrm_2.4.16.bb @@ -0,0 +1,4 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch;patch=1" +PR = "r1" diff --git a/meta/packages/xorg-app/mkfontdir_1.0.5.bb b/meta/packages/xorg-app/mkfontdir_1.0.5.bb new file mode 100644 index 0000000000..98fcdd47c5 --- /dev/null +++ b/meta/packages/xorg-app/mkfontdir_1.0.5.bb @@ -0,0 +1,9 @@ +require xorg-app-common.inc + +DESCRIPTION = "a program to create an index of X font files in a directory" + +PE = "1" + +RDEPENDS += "mkfontscale" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-app/mkfontscale_1.0.7.bb b/meta/packages/xorg-app/mkfontscale_1.0.7.bb new file mode 100644 index 0000000000..e7cb66625a --- /dev/null +++ b/meta/packages/xorg-app/mkfontscale_1.0.7.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc + +DESCRIPTION = "a program to create an index of scalable font files for X" + +DEPENDS += " zlib libfontenc freetype virtual/libx11" + +BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb deleted file mode 100644 index d1fb0f000d..0000000000 --- a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- evdev input driver" - diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb new file mode 100644 index 0000000000..d1fb0f000d --- /dev/null +++ b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb @@ -0,0 +1,4 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" + diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb deleted file mode 100644 index f554141c97..0000000000 --- a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- keyboard input driver" - diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb new file mode 100644 index 0000000000..f554141c97 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb @@ -0,0 +1,4 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- keyboard input driver" + diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb b/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb deleted file mode 100644 index 39c2e05daf..0000000000 --- a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- mouse input driver" - diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb new file mode 100644 index 0000000000..39c2e05daf --- /dev/null +++ b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb @@ -0,0 +1,4 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" + diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb b/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb deleted file mode 100644 index f554141c97..0000000000 --- a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- keyboard input driver" - diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb new file mode 100644 index 0000000000..81128394c3 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb @@ -0,0 +1,5 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- keyboard input driver" + +DEPENDS += "libxi" diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb index b4f13f6923..f7dc3b731c 100644 --- a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb +++ b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb @@ -7,3 +7,4 @@ PV = "0.15.2+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git" S = "${WORKDIR}/git" +DEPENDS += "libxi" diff --git a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb deleted file mode 100644 index c0297f1d55..0000000000 --- a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xf86-input-common.inc - -DESCRIPTION = "X.Org X server -- VMWare mouse input driver" -PR = "r1" - -RDEPENDS_${PN} += "xf86-input-mouse" - - diff --git a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb new file mode 100644 index 0000000000..c0297f1d55 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb @@ -0,0 +1,8 @@ +require xf86-input-common.inc + +DESCRIPTION = "X.Org X server -- VMWare mouse input driver" +PR = "r1" + +RDEPENDS_${PN} += "xf86-input-mouse" + + diff --git a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb deleted file mode 100644 index 74a8848637..0000000000 --- a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xf86-video-common.inc - -DESCRIPTION = "X.Org X server -- VMware SVGA II display driver" -DEPENDS += "virtual/libx11 libxvmc drm glproto \ - virtual/libgl xineramaproto libpciaccess" - -COMPATIBLE_HOST = '(i.86.*-linux)' \ No newline at end of file diff --git a/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb new file mode 100644 index 0000000000..74a8848637 --- /dev/null +++ b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb @@ -0,0 +1,7 @@ +require xf86-video-common.inc + +DESCRIPTION = "X.Org X server -- VMware SVGA II display driver" +DEPENDS += "virtual/libx11 libxvmc drm glproto \ + virtual/libgl xineramaproto libpciaccess" + +COMPATIBLE_HOST = '(i.86.*-linux)' \ No newline at end of file diff --git a/meta/packages/xorg-font/encodings_1.0.3.bb b/meta/packages/xorg-font/encodings_1.0.3.bb new file mode 100644 index 0000000000..ecc3eed540 --- /dev/null +++ b/meta/packages/xorg-font/encodings_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-font-common.inc +PE = "1" +PR = "${INC_PR}.0" + +DEPENDS = "mkfontscale-native font-util-native" diff --git a/meta/packages/xorg-font/font-alias_1.0.2.bb b/meta/packages/xorg-font/font-alias_1.0.2.bb new file mode 100644 index 0000000000..5314cbc5db --- /dev/null +++ b/meta/packages/xorg-font/font-alias_1.0.2.bb @@ -0,0 +1,9 @@ +require xorg-font-common.inc + +DESCRIPTION = "X font aliases." + +DEPENDS = "virtual/xserver font-util" +RDEPENDS = "encodings font-util" + +PE = "1" +PR = "${INC_PR}.0" diff --git a/meta/packages/xorg-font/font-util_1.1.1.bb b/meta/packages/xorg-font/font-util_1.1.1.bb new file mode 100644 index 0000000000..b7819d1244 --- /dev/null +++ b/meta/packages/xorg-font/font-util_1.1.1.bb @@ -0,0 +1,17 @@ +require xorg-font-common.inc + +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + +DESCRIPTION = "X font utils." + +DEPENDS = "encodings util-macros" +DEPENDS_virtclass-native = "util-macros-native" +RDEPENDS = "mkfontdir mkfontscale encodings" + +PR = "${INC_PR}.1" + +do_configure_prepend() { + sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in +} + +BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta/packages/xorg-font/xorg-font-common.inc b/meta/packages/xorg-font/xorg-font-common.inc new file mode 100644 index 0000000000..52dc2208df --- /dev/null +++ b/meta/packages/xorg-font/xorg-font-common.inc @@ -0,0 +1,45 @@ +HOMEPAGE = "http://www.x.org" +SECTION = "x11/fonts" +LICENSE = "MIT-X" + +DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native" +RDEPENDS = "encodings font-util font-alias" + +XORG_PN = "${BPN}" +INC_PR = "r1" + +SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-${PV}" + +inherit autotools pkgconfig + +EXTRA_OEMAKE += "FCCACHE=/bin/true" + +do_configure_prepend() { + if [ -f "${S}"/configure.ac ] ; then + sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac + fi +} + +do_install_append() { + find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f + find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f + find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f + find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f +} + +PACKAGE_ARCH = "all" + +FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" + +pkg_postinst_${PN} () { + set -x + for fontdir in `find $D/usr/lib/X11/fonts -type d`; do + mkfontdir $fontdir + mkfontscale $fontdir + done + for fontdir in `find $D/usr/share/fonts/X11 -type d`; do + mkfontdir $fontdir + mkfontscale $fontdir + done +} diff --git a/meta/packages/xorg-lib/libdmx_1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.0.2.bb deleted file mode 100644 index 9b66101563..0000000000 --- a/meta/packages/xorg-lib/libdmx_1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 Distributed Multihead extension library" -DEPENDS += "libxext dmxproto" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-lib/libdmx_1.1.0.bb b/meta/packages/xorg-lib/libdmx_1.1.0.bb new file mode 100644 index 0000000000..9b66101563 --- /dev/null +++ b/meta/packages/xorg-lib/libdmx_1.1.0.bb @@ -0,0 +1,6 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Distributed Multihead extension library" +DEPENDS += "libxext dmxproto" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb b/meta/packages/xorg-lib/libx11-diet_1.2.1.bb deleted file mode 100644 index a76aba16e4..0000000000 --- a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libx11.inc - -PR = "r1" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1 \ - file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ - file://fix-utf8-wrong-define.patch;patch=1" - -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" - -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-diet_1.3.bb b/meta/packages/xorg-lib/libx11-diet_1.3.bb new file mode 100644 index 0000000000..a76aba16e4 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-diet_1.3.bb @@ -0,0 +1,17 @@ +require libx11.inc + +PR = "r1" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1 \ + file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" +CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb b/meta/packages/xorg-lib/libx11-trim_1.2.1.bb deleted file mode 100644 index 08c8b163ab..0000000000 --- a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libx11.inc - -PR = "r6" - -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://include_fix.patch;patch=1 \ - file://nodolt.patch;patch=1" - -EXTRA_OECONF += "--disable-xcms --with-xcb" diff --git a/meta/packages/xorg-lib/libx11-trim_1.3.bb b/meta/packages/xorg-lib/libx11-trim_1.3.bb new file mode 100644 index 0000000000..08c8b163ab --- /dev/null +++ b/meta/packages/xorg-lib/libx11-trim_1.3.bb @@ -0,0 +1,11 @@ +require libx11.inc + +PR = "r6" + +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1 \ + file://nodolt.patch;patch=1" + +EXTRA_OECONF += "--disable-xcms --with-xcb" diff --git a/meta/packages/xorg-lib/libx11_1.2.1.bb b/meta/packages/xorg-lib/libx11_1.2.1.bb deleted file mode 100644 index ff62d90464..0000000000 --- a/meta/packages/xorg-lib/libx11_1.2.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require libx11.inc - -PE = "1" -PR = "r2" - -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://nodolt.patch;patch=1 \ - file://include_fix.patch;patch=1" - -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext" - -EXTRA_OECONF += "--without-xcb" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-lib/libx11_1.3.bb b/meta/packages/xorg-lib/libx11_1.3.bb new file mode 100644 index 0000000000..ff62d90464 --- /dev/null +++ b/meta/packages/xorg-lib/libx11_1.3.bb @@ -0,0 +1,15 @@ +require libx11.inc + +PE = "1" +PR = "r2" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://nodolt.patch;patch=1 \ + file://include_fix.patch;patch=1" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext" + +EXTRA_OECONF += "--without-xcb" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-lib/libxext_1.0.5.bb b/meta/packages/xorg-lib/libxext_1.0.5.bb deleted file mode 100644 index e1f13a1d1a..0000000000 --- a/meta/packages/xorg-lib/libxext_1.0.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 miscellaneous extension library" -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" -PROVIDES = "xext" -PE = "1" - -XORG_PN = "libXext" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-lib/libxext_1.1.1.bb b/meta/packages/xorg-lib/libxext_1.1.1.bb new file mode 100644 index 0000000000..e1f13a1d1a --- /dev/null +++ b/meta/packages/xorg-lib/libxext_1.1.1.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" +PROVIDES = "xext" +PE = "1" + +XORG_PN = "libXext" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-lib/libxi_1.2.1.bb b/meta/packages/xorg-lib/libxi_1.2.1.bb deleted file mode 100644 index 0c0529d7fe..0000000000 --- a/meta/packages/xorg-lib/libxi_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 Input extension library" -DEPENDS += "libxext inputproto" -PE = "1" - -XORG_PN = "libXi" - diff --git a/meta/packages/xorg-lib/libxi_1.3.bb b/meta/packages/xorg-lib/libxi_1.3.bb new file mode 100644 index 0000000000..0c0529d7fe --- /dev/null +++ b/meta/packages/xorg-lib/libxi_1.3.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PE = "1" + +XORG_PN = "libXi" + diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb index 13e51f4378..30c1778c3e 100644 --- a/meta/packages/xorg-lib/libxi_git.bb +++ b/meta/packages/xorg-lib/libxi_git.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Input extension library" DEPENDS += "libxext inputproto" PE = "1" -PV = "1.9.99.5+gitr${SRCPV}" +PV = "1.2.99.5+gitr${SRCPV}" XORG_PN = "libXi" diff --git a/meta/packages/xorg-lib/libxinerama_1.0.3.bb b/meta/packages/xorg-lib/libxinerama_1.0.3.bb deleted file mode 100644 index b7135bc28e..0000000000 --- a/meta/packages/xorg-lib/libxinerama_1.0.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 Xinerama extension library" -DEPENDS += "libxext xineramaproto" -PROVIDES = "xinerama" -PR = "r3" -PE = "1" - -XORG_PN = "libXinerama" diff --git a/meta/packages/xorg-lib/libxinerama_1.1.bb b/meta/packages/xorg-lib/libxinerama_1.1.bb new file mode 100644 index 0000000000..b7135bc28e --- /dev/null +++ b/meta/packages/xorg-lib/libxinerama_1.1.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Xinerama extension library" +DEPENDS += "libxext xineramaproto" +PROVIDES = "xinerama" +PR = "r3" +PE = "1" + +XORG_PN = "libXinerama" diff --git a/meta/packages/xorg-lib/libxtst_1.0.3.bb b/meta/packages/xorg-lib/libxtst_1.0.3.bb deleted file mode 100644 index a83a69e591..0000000000 --- a/meta/packages/xorg-lib/libxtst_1.0.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X Test Extension: client side library" -DEPENDS += "libxext recordproto inputproto libxi" -PROVIDES = "xtst" -PR = "r2" -PE = "1" - -XORG_PN = "libXtst" diff --git a/meta/packages/xorg-lib/libxtst_1.1.0.bb b/meta/packages/xorg-lib/libxtst_1.1.0.bb new file mode 100644 index 0000000000..a83a69e591 --- /dev/null +++ b/meta/packages/xorg-lib/libxtst_1.1.0.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X Test Extension: client side library" +DEPENDS += "libxext recordproto inputproto libxi" +PROVIDES = "xtst" +PR = "r2" +PE = "1" + +XORG_PN = "libXtst" diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb b/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb deleted file mode 100644 index 47492d7108..0000000000 --- a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 Direct Graphics Access extension library" -DEPENDS += "libxext xf86dgaproto" -PR = "r1" -PE = "1" - -XORG_PN = "libXxf86dga" diff --git a/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb new file mode 100644 index 0000000000..47492d7108 --- /dev/null +++ b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Direct Graphics Access extension library" +DEPENDS += "libxext xf86dgaproto" +PR = "r1" +PE = "1" + +XORG_PN = "libXxf86dga" diff --git a/meta/packages/xorg-lib/pixman_0.13.2.bb b/meta/packages/xorg-lib/pixman_0.13.2.bb deleted file mode 100644 index e4132954ab..0000000000 --- a/meta/packages/xorg-lib/pixman_0.13.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Library for lowlevel pixel operations" -DEPENDS = "virtual/libx11" diff --git a/meta/packages/xorg-lib/pixman_0.17.4.bb b/meta/packages/xorg-lib/pixman_0.17.4.bb new file mode 100644 index 0000000000..e4132954ab --- /dev/null +++ b/meta/packages/xorg-lib/pixman_0.17.4.bb @@ -0,0 +1,4 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Library for lowlevel pixel operations" +DEPENDS = "virtual/libx11" diff --git a/meta/packages/xorg-proto/applewmproto_1.1.0.bb b/meta/packages/xorg-proto/applewmproto_1.1.0.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/applewmproto_1.1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/applewmproto_1.4.1.bb b/meta/packages/xorg-proto/applewmproto_1.4.1.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/applewmproto_1.4.1.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb deleted file mode 100644 index 29c9f3fc34..0000000000 --- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r2" -PE = "1" - -DEPENDS += "gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb new file mode 100644 index 0000000000..29c9f3fc34 --- /dev/null +++ b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r2" +PE = "1" + +DEPENDS += "gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/damageproto_1.1.0.bb b/meta/packages/xorg-proto/damageproto_1.1.0.bb deleted file mode 100644 index 202ec2874f..0000000000 --- a/meta/packages/xorg-proto/damageproto_1.1.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "damageext" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/damageproto_1.2.0.bb b/meta/packages/xorg-proto/damageproto_1.2.0.bb new file mode 100644 index 0000000000..202ec2874f --- /dev/null +++ b/meta/packages/xorg-proto/damageproto_1.2.0.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "damageext" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/dmxproto_2.2.2.bb b/meta/packages/xorg-proto/dmxproto_2.2.2.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/dmxproto_2.2.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/dmxproto_2.3.bb b/meta/packages/xorg-proto/dmxproto_2.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/dmxproto_2.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/dri2proto_1.99.3.bb b/meta/packages/xorg-proto/dri2proto_1.99.3.bb deleted file mode 100644 index 8decda682f..0000000000 --- a/meta/packages/xorg-proto/dri2proto_1.99.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -DESCRIPTION = "DRI2 extension headers" - -DEPENDS += "util-macros" - -require xorg-proto-common.inc diff --git a/meta/packages/xorg-proto/dri2proto_2.2.bb b/meta/packages/xorg-proto/dri2proto_2.2.bb new file mode 100644 index 0000000000..8decda682f --- /dev/null +++ b/meta/packages/xorg-proto/dri2proto_2.2.bb @@ -0,0 +1,5 @@ +DESCRIPTION = "DRI2 extension headers" + +DEPENDS += "util-macros" + +require xorg-proto-common.inc diff --git a/meta/packages/xorg-proto/evieext_1.0.2.bb b/meta/packages/xorg-proto/evieext_1.0.2.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/evieext_1.0.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/evieext_1.1.0.bb b/meta/packages/xorg-proto/evieext_1.1.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/evieext_1.1.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/fixesproto_4.0.bb b/meta/packages/xorg-proto/fixesproto_4.0.bb deleted file mode 100644 index 20f95282e5..0000000000 --- a/meta/packages/xorg-proto/fixesproto_4.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "fixesext" -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/fixesproto_4.1.1.bb b/meta/packages/xorg-proto/fixesproto_4.1.1.bb new file mode 100644 index 0000000000..20f95282e5 --- /dev/null +++ b/meta/packages/xorg-proto/fixesproto_4.1.1.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "fixesext" +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb deleted file mode 100644 index 2a9b73adfc..0000000000 --- a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb new file mode 100644 index 0000000000..2a9b73adfc --- /dev/null +++ b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.0.2.bb deleted file mode 100644 index 2a9b73adfc..0000000000 --- a/meta/packages/xorg-proto/fontsproto_2.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/fontsproto_2.1.0.bb b/meta/packages/xorg-proto/fontsproto_2.1.0.bb new file mode 100644 index 0000000000..2a9b73adfc --- /dev/null +++ b/meta/packages/xorg-proto/fontsproto_2.1.0.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/glproto_1.4.11.bb b/meta/packages/xorg-proto/glproto_1.4.11.bb new file mode 100644 index 0000000000..022bea1ee8 --- /dev/null +++ b/meta/packages/xorg-proto/glproto_1.4.11.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/glproto_1.4.9.bb b/meta/packages/xorg-proto/glproto_1.4.9.bb deleted file mode 100644 index 022bea1ee8..0000000000 --- a/meta/packages/xorg-proto/glproto_1.4.9.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb b/meta/packages/xorg-proto/inputproto_1.9.99.12.bb deleted file mode 100644 index 392aef20f6..0000000000 --- a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r2" -PE = "1" - -DEPENDS += "util-macros gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/inputproto_2.0.bb b/meta/packages/xorg-proto/inputproto_2.0.bb new file mode 100644 index 0000000000..392aef20f6 --- /dev/null +++ b/meta/packages/xorg-proto/inputproto_2.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r2" +PE = "1" + +DEPENDS += "util-macros gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb deleted file mode 100644 index 29c9f3fc34..0000000000 --- a/meta/packages/xorg-proto/kbproto_1.0.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r2" -PE = "1" - -DEPENDS += "gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/kbproto_1.0.4.bb b/meta/packages/xorg-proto/kbproto_1.0.4.bb new file mode 100644 index 0000000000..29c9f3fc34 --- /dev/null +++ b/meta/packages/xorg-proto/kbproto_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r2" +PE = "1" + +DEPENDS += "gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb b/meta/packages/xorg-proto/randrproto_1.2.99.3.bb deleted file mode 100644 index 42d33fb674..0000000000 --- a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "randrext" -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/randrproto_1.3.1.bb b/meta/packages/xorg-proto/randrproto_1.3.1.bb new file mode 100644 index 0000000000..42d33fb674 --- /dev/null +++ b/meta/packages/xorg-proto/randrproto_1.3.1.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "randrext" +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/recordproto_1.13.2.bb b/meta/packages/xorg-proto/recordproto_1.13.2.bb deleted file mode 100644 index af63403600..0000000000 --- a/meta/packages/xorg-proto/recordproto_1.13.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "recordext" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/recordproto_1.14.bb b/meta/packages/xorg-proto/recordproto_1.14.bb new file mode 100644 index 0000000000..af63403600 --- /dev/null +++ b/meta/packages/xorg-proto/recordproto_1.14.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "recordext" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/renderproto_0.11.bb b/meta/packages/xorg-proto/renderproto_0.11.bb new file mode 100644 index 0000000000..0168b9227c --- /dev/null +++ b/meta/packages/xorg-proto/renderproto_0.11.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +CONFLICTS = "renderext" +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.9.3.bb deleted file mode 100644 index 0168b9227c..0000000000 --- a/meta/packages/xorg-proto/renderproto_0.9.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "renderext" -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/xorg-proto/resourceproto_1.0.2.bb b/meta/packages/xorg-proto/resourceproto_1.0.2.bb deleted file mode 100644 index 1fb8aa7f12..0000000000 --- a/meta/packages/xorg-proto/resourceproto_1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "resourceext" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/resourceproto_1.1.0.bb b/meta/packages/xorg-proto/resourceproto_1.1.0.bb new file mode 100644 index 0000000000..1fb8aa7f12 --- /dev/null +++ b/meta/packages/xorg-proto/resourceproto_1.1.0.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "resourceext" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/videoproto_2.2.2.bb b/meta/packages/xorg-proto/videoproto_2.2.2.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/videoproto_2.2.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/videoproto_2.3.0.bb b/meta/packages/xorg-proto/videoproto_2.3.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/videoproto_2.3.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_1.0.3.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.4.bb b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb deleted file mode 100644 index 29c9f3fc34..0000000000 --- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r2" -PE = "1" - -DEPENDS += "gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb new file mode 100644 index 0000000000..29c9f3fc34 --- /dev/null +++ b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r2" +PE = "1" + +DEPENDS += "gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xextproto_7.0.5.bb b/meta/packages/xorg-proto/xextproto_7.0.5.bb deleted file mode 100644 index b37de80bf6..0000000000 --- a/meta/packages/xorg-proto/xextproto_7.0.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r3" -PE = "1" - -DEPENDS += "util-macros gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xextproto_7.1.0.bb b/meta/packages/xorg-proto/xextproto_7.1.0.bb new file mode 100644 index 0000000000..e357188ec8 --- /dev/null +++ b/meta/packages/xorg-proto/xextproto_7.1.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r4" +PE = "1" + +DEPENDS += "util-macros gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb deleted file mode 100644 index d54c9011a0..0000000000 --- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -DEPENDS += "gettext" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb new file mode 100644 index 0000000000..d54c9011a0 --- /dev/null +++ b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +DEPENDS += "gettext" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb b/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb deleted file mode 100644 index 2e0e734858..0000000000 --- a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -CONFLICTS = "xxf86dgaext" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.1.bb b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb new file mode 100644 index 0000000000..2e0e734858 --- /dev/null +++ b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +CONFLICTS = "xxf86dgaext" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb b/meta/packages/xorg-proto/xf86driproto_2.0.4.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/xf86driproto_2.1.0.bb b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.1.2.bb deleted file mode 100644 index 9f09fff7b7..0000000000 --- a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/xineramaproto_1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.2.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/meta/packages/xorg-proto/xineramaproto_1.2.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.14.bb deleted file mode 100644 index 4a9bc806b5..0000000000 --- a/meta/packages/xorg-proto/xproto_7.0.14.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-proto-common.inc - -PR = "r1" -PE = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xproto_7.0.16.bb b/meta/packages/xorg-proto/xproto_7.0.16.bb new file mode 100644 index 0000000000..4a9bc806b5 --- /dev/null +++ b/meta/packages/xorg-proto/xproto_7.0.16.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb deleted file mode 100644 index 9c3d9efa71..0000000000 --- a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xorg-proto-common.inc - -PROVIDES="xproxymngproto" -PR = "r1" -PE = "1" diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb new file mode 100644 index 0000000000..9c3d9efa71 --- /dev/null +++ b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb @@ -0,0 +1,5 @@ +require xorg-proto-common.inc + +PROVIDES="xproxymngproto" +PR = "r1" +PE = "1" diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch new file mode 100644 index 0000000000..2341e40bca --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch @@ -0,0 +1,19 @@ +Index: xorg-server-1.7.99.2/configure.ac +=================================================================== +--- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 ++++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 +@@ -503,14 +503,10 @@ + + dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, + dnl otherwise uses standard subdirectories of FONTROOTDIR +-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], +- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], +- [ + DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" + case $host_os in + darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; + esac +- ]) + AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), + [ FONTPATH="$withval" ], + [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb new file mode 100644 index 0000000000..cde1712992 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb @@ -0,0 +1,18 @@ +require xserver-xf86-dri-lite.inc + +PE = "1" +PR = "r3" + +PROTO_DEPS += "xf86driproto dri2proto" + +DEPENDS += "font-util" + +SRC_URI += "file://nodolt.patch;patch=1 \ + file://crosscompile.patch;patch=1" +# file://libdri-xinerama-symbol.patch;patch=1 \ +# file://xserver-boottime.patch;patch=1" + +# Misc build failure for master HEAD +SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1" + +EXTRA_OECONF += "--enable-dri --enable-dri2" -- cgit v1.2.3-54-g00ecf