summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRobert Bragg <bob@openedhand.com>2008-10-14 09:30:18 +0000
committerRobert Bragg <bob@openedhand.com>2008-10-14 09:30:18 +0000
commiteacf14f20429604fa3fe8cc81d89f61a5ee5a482 (patch)
treed68ddd601b15fa261228638721584ea3fa9528bc /meta/packages
parentcd2ce1906ec08401c6a0fbd234408024dcf4280e (diff)
downloadpoky-eacf14f20429604fa3fe8cc81d89f61a5ee5a482.tar.gz
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')
-rw-r--r--meta/packages/xcb/libxcb_git.bb8
-rw-r--r--meta/packages/xcb/xcb-proto_1.2.bb (renamed from meta/packages/xcb/xcb-proto_1.0.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11_git.bb1
-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.bb8
-rw-r--r--meta/packages/xorg-lib/libxi_git.bb13
7 files changed, 24 insertions, 14 deletions
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 @@
1DEFAULT_PREFERENCE = "-1" 1DEFAULT_PREFERENCE = "-1"
2 2
3include libxcb.inc 3include libxcb.inc
4PV = "1.0+git" 4PV = "1.1.90.1+git${SRCREV}"
5PR = "r1" 5PR = "r2"
6 6
7DEPENDS += "libpthread-stubs" 7DEPENDS += "libpthread-stubs"
8 8
9SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" 9SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb;protocol=git"
10S = "${WORKDIR}/git/xcb" 10S = "${WORKDIR}/git"
11 11
12PACKAGES =+ "libxcb-xinerama" 12PACKAGES =+ "libxcb-xinerama"
diff --git a/meta/packages/xcb/xcb-proto_1.0.bb b/meta/packages/xcb/xcb-proto_1.2.bb
index e602252d92..e602252d92 100644
--- a/meta/packages/xcb/xcb-proto_1.0.bb
+++ b/meta/packages/xcb/xcb-proto_1.2.bb
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
7PROVIDES = "virtual/libx11" 7PROVIDES = "virtual/libx11"
8RPROVIDES = "virtual/libx11" 8RPROVIDES = "virtual/libx11"
9PR = "r1" 9PR = "r1"
10PV = "1.1.99.1+git${SRCREV}"
10 11
11FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" 12FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
12FILES_${PN}-locale += "${datadir}/X11/locale" 13FILES_${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 @@
1require libxext_${PV}.bb 1require libxext_git.bb
2 2
3DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" 3DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk"
4PROVIDES = "" 4PROVIDES = ""
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
3DESCRIPTION = "X11 miscellaneous extension library" 3DESCRIPTION = "X11 miscellaneous extension library"
4DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" 4DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
5PROVIDES = "xext" 5PROVIDES = "xext"
6PR = "r1" 6PR = "r0"
7PE = "1" 7PE = "1"
8PV = "1.0.99.1+git${SRCREV}"
9
10SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXext;protocol=git"
11S = "${WORKDIR}/git"
8 12
9XORG_PN = "libXext" 13XORG_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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 Input extension library"
4DEPENDS += "libxext inputproto"
5PR = "r1"
6PE = "1"
7
8XORG_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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 Input extension library"
4DEPENDS += "libxext inputproto"
5PR = "r0"
6PE = "1"
7PV = "1.1.99.1+git${SRCREV}"
8
9SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXi;protocol=git"
10S = "${WORKDIR}/git"
11
12XORG_PN = "libXi"
13