diff options
| author | Robert Bragg <bob@openedhand.com> | 2008-10-14 09:30:18 +0000 |
|---|---|---|
| committer | Robert Bragg <bob@openedhand.com> | 2008-10-14 09:30:18 +0000 |
| commit | eacf14f20429604fa3fe8cc81d89f61a5ee5a482 (patch) | |
| tree | d68ddd601b15fa261228638721584ea3fa9528bc /meta/packages/xorg-lib | |
| parent | cd2ce1906ec08401c6a0fbd234408024dcf4280e (diff) | |
| download | openembedded-core-eacf14f20429604fa3fe8cc81d89f61a5ee5a482.tar.gz openembedded-core-eacf14f20429604fa3fe8cc81d89f61a5ee5a482.tar.bz2 openembedded-core-eacf14f20429604fa3fe8cc81d89f61a5ee5a482.zip | |
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
Diffstat (limited to 'meta/packages/xorg-lib')
| -rw-r--r-- | meta/packages/xorg-lib/libx11_git.bb | 1 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libxext-sdk_git.bb (renamed from meta/packages/xorg-lib/libxext-sdk_1.0.4.bb) | 2 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libxext_git.bb (renamed from meta/packages/xorg-lib/libxext_1.0.4.bb) | 6 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libxi_1.1.3.bb | 8 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libxi_git.bb | 13 |
5 files changed, 20 insertions, 10 deletions
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_git.bb index 267faa584e..e508b5b8ea 100644 --- a/meta/packages/xorg-lib/libxext-sdk_1.0.4.bb +++ b/meta/packages/xorg-lib/libxext-sdk_git.bb @@ -1,4 +1,4 @@ -require libxext_${PV}.bb +require libxext_git.bb DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" PROVIDES = "" diff --git a/meta/packages/xorg-lib/libxext_1.0.4.bb b/meta/packages/xorg-lib/libxext_git.bb index a8096f7a23..4c59f3d368 100644 --- a/meta/packages/xorg-lib/libxext_1.0.4.bb +++ b/meta/packages/xorg-lib/libxext_git.bb @@ -3,7 +3,11 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous extension library" DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" PROVIDES = "xext" -PR = "r1" +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" + |