From eacf14f20429604fa3fe8cc81d89f61a5ee5a482 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 14 Oct 2008 09:30:18 +0000 Subject: Various X package updates to deal with XInput.h being removed in the latest inputproto package. Updates libx11, libxext, libxext-sdk, libxi, xcb-proto and libxcb Note: There is a still a xcb build issue that needs investigating with these updated packages. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5489 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-fixed-revisions.inc | 4 ++++ meta/conf/distro/include/preferred-xorg-versions.inc | 12 ++++++------ meta/packages/xcb/libxcb_git.bb | 8 ++++---- meta/packages/xcb/xcb-proto_1.0.bb | 2 -- meta/packages/xcb/xcb-proto_1.2.bb | 2 ++ meta/packages/xorg-lib/libx11_git.bb | 1 + meta/packages/xorg-lib/libxext-sdk_1.0.4.bb | 6 ------ meta/packages/xorg-lib/libxext-sdk_git.bb | 6 ++++++ meta/packages/xorg-lib/libxext_1.0.4.bb | 9 --------- meta/packages/xorg-lib/libxext_git.bb | 13 +++++++++++++ meta/packages/xorg-lib/libxi_1.1.3.bb | 8 -------- meta/packages/xorg-lib/libxi_git.bb | 13 +++++++++++++ 12 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 meta/packages/xcb/xcb-proto_1.0.bb create mode 100644 meta/packages/xcb/xcb-proto_1.2.bb delete mode 100644 meta/packages/xorg-lib/libxext-sdk_1.0.4.bb create mode 100644 meta/packages/xorg-lib/libxext-sdk_git.bb delete mode 100644 meta/packages/xorg-lib/libxext_1.0.4.bb create mode 100644 meta/packages/xorg-lib/libxext_git.bb delete mode 100644 meta/packages/xorg-lib/libxi_1.1.3.bb create mode 100644 meta/packages/xorg-lib/libxi_git.bb (limited to 'meta') diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index eb9f60913f..d1555b05f8 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -159,6 +159,10 @@ SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee" SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" +SRCREV_pn-libxi ?= "e179b124aac13387c6f730197b8852c1f69eb9e3" +SRCREV_pn-libx11 ?= "d23aad31338e7d869d878d5aa1b6b91d20287005" +SRCREV_pn-libxext ?= "49563f5d76637e2ca28fe0b91ce3114271c0955d" +SRCREV_pn-libxcb ?= "625ed596cae6dd8175aeb6cb6f26784928042f22" # # Preferred Versions: diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 887cc31bbc..aa1665986d 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -34,7 +34,7 @@ PREFERRED_VERSION_liblbxutil ?= "1.0.1" PREFERRED_VERSION_liboldx ?= "1.0.1" PREFERRED_VERSION_libsm ?= "1.0.3" PREFERRED_VERSION_libwindowswm ?= "1.0.0" -PREFERRED_VERSION_libx11 ?= "1.1.5" +PREFERRED_VERSION_libx11 ?= "1.1.99.1+git${SRCREV}" PREFERRED_VERSION_libx11-diet ?= "1.1.5" PREFERRED_VERSION_libx11-native ?= "1.1.5" PREFERRED_VERSION_libx11-sdk ?= "1.1.5" @@ -50,14 +50,14 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2" PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2" PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.4" -PREFERRED_VERSION_libxext-sdk ?= "1.0.4" +PREFERRED_VERSION_libxext ?= "1.0.99.1+git${SRCREV}" +PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+git${SRCREV}"" PREFERRED_VERSION_libxfixes ?= "4.0.3" PREFERRED_VERSION_libxfont ?= "1.3.3" PREFERRED_VERSION_libxfont-native ?= "1.3.2" PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxft ?= "2.1.12" -PREFERRED_VERSION_libxi ?= "1.1.3" +PREFERRED_VERSION_libxi ?= "1.1.99.1+git${SRCREV}" PREFERRED_VERSION_libxinerama ?= "1.0.3" PREFERRED_VERSION_libxkbfile ?= "1.0.5" PREFERRED_VERSION_libxkbui ?= "1.0.2" @@ -138,8 +138,8 @@ PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.0.3" PREFERRED_VERSION_mesa-dri ?= "7.2" PREFERRED_VERSION_libdrm ?= "2.3.1" -PREFERRED_VERSION_xcb-proto ?= "1.0" -PREFERRED_VERSION_libxcb ?= "1.0" +PREFERRED_VERSION_xcb-proto ?= "1.2" +PREFERRED_VERSION_libxcb ?= "1.1.90.1+git${SRCREV}" PREFERRED_VERSION_libpciaccess ?= "0.10.3" PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" diff --git a/meta/packages/xcb/libxcb_git.bb b/meta/packages/xcb/libxcb_git.bb index a7707b3507..046352543f 100644 --- a/meta/packages/xcb/libxcb_git.bb +++ b/meta/packages/xcb/libxcb_git.bb @@ -1,12 +1,12 @@ DEFAULT_PREFERENCE = "-1" include libxcb.inc -PV = "1.0+git" -PR = "r1" +PV = "1.1.90.1+git${SRCREV}" +PR = "r2" DEPENDS += "libpthread-stubs" -SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" -S = "${WORKDIR}/git/xcb" +SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb;protocol=git" +S = "${WORKDIR}/git" PACKAGES =+ "libxcb-xinerama" diff --git a/meta/packages/xcb/xcb-proto_1.0.bb b/meta/packages/xcb/xcb-proto_1.0.bb deleted file mode 100644 index e602252d92..0000000000 --- a/meta/packages/xcb/xcb-proto_1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -include xcb-proto.inc -PR = "r1" diff --git a/meta/packages/xcb/xcb-proto_1.2.bb b/meta/packages/xcb/xcb-proto_1.2.bb new file mode 100644 index 0000000000..e602252d92 --- /dev/null +++ b/meta/packages/xcb/xcb-proto_1.2.bb @@ -0,0 +1,2 @@ +include xcb-proto.inc +PR = "r1" diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb index f2929624e8..b0df259704 100644 --- a/meta/packages/xorg-lib/libx11_git.bb +++ b/meta/packages/xorg-lib/libx11_git.bb @@ -7,6 +7,7 @@ DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfon PROVIDES = "virtual/libx11" RPROVIDES = "virtual/libx11" PR = "r1" +PV = "1.1.99.1+git${SRCREV}" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/meta/packages/xorg-lib/libxext-sdk_1.0.4.bb b/meta/packages/xorg-lib/libxext-sdk_1.0.4.bb deleted file mode 100644 index 267faa584e..0000000000 --- a/meta/packages/xorg-lib/libxext-sdk_1.0.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxext_${PV}.bb - -DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" -PROVIDES = "" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxext-sdk_git.bb b/meta/packages/xorg-lib/libxext-sdk_git.bb new file mode 100644 index 0000000000..e508b5b8ea --- /dev/null +++ b/meta/packages/xorg-lib/libxext-sdk_git.bb @@ -0,0 +1,6 @@ +require libxext_git.bb + +DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" +PROVIDES = "" + +inherit sdk diff --git a/meta/packages/xorg-lib/libxext_1.0.4.bb b/meta/packages/xorg-lib/libxext_1.0.4.bb deleted file mode 100644 index a8096f7a23..0000000000 --- a/meta/packages/xorg-lib/libxext_1.0.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 miscellaneous extension library" -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" -PROVIDES = "xext" -PR = "r1" -PE = "1" - -XORG_PN = "libXext" diff --git a/meta/packages/xorg-lib/libxext_git.bb b/meta/packages/xorg-lib/libxext_git.bb new file mode 100644 index 0000000000..4c59f3d368 --- /dev/null +++ b/meta/packages/xorg-lib/libxext_git.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" +PROVIDES = "xext" +PR = "r0" +PE = "1" +PV = "1.0.99.1+git${SRCREV}" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXext;protocol=git" +S = "${WORKDIR}/git" + +XORG_PN = "libXext" diff --git a/meta/packages/xorg-lib/libxi_1.1.3.bb b/meta/packages/xorg-lib/libxi_1.1.3.bb deleted file mode 100644 index 31e3b4906d..0000000000 --- a/meta/packages/xorg-lib/libxi_1.1.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require xorg-lib-common.inc - -DESCRIPTION = "X11 Input extension library" -DEPENDS += "libxext inputproto" -PR = "r1" -PE = "1" - -XORG_PN = "libXi" diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb new file mode 100644 index 0000000000..bc61eae6e9 --- /dev/null +++ b/meta/packages/xorg-lib/libxi_git.bb @@ -0,0 +1,13 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Input extension library" +DEPENDS += "libxext inputproto" +PR = "r0" +PE = "1" +PV = "1.1.99.1+git${SRCREV}" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXi;protocol=git" +S = "${WORKDIR}/git" + +XORG_PN = "libXi" + -- cgit 1.2.3-korg