summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc4
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc12
-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
9 files changed, 34 insertions, 20 deletions
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"
159SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" 159SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
160SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" 160SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
161SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07" 161SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
162SRCREV_pn-libxi ?= "e179b124aac13387c6f730197b8852c1f69eb9e3"
163SRCREV_pn-libx11 ?= "d23aad31338e7d869d878d5aa1b6b91d20287005"
164SRCREV_pn-libxext ?= "49563f5d76637e2ca28fe0b91ce3114271c0955d"
165SRCREV_pn-libxcb ?= "625ed596cae6dd8175aeb6cb6f26784928042f22"
162 166
163# 167#
164# Preferred Versions: 168# 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"
34PREFERRED_VERSION_liboldx ?= "1.0.1" 34PREFERRED_VERSION_liboldx ?= "1.0.1"
35PREFERRED_VERSION_libsm ?= "1.0.3" 35PREFERRED_VERSION_libsm ?= "1.0.3"
36PREFERRED_VERSION_libwindowswm ?= "1.0.0" 36PREFERRED_VERSION_libwindowswm ?= "1.0.0"
37PREFERRED_VERSION_libx11 ?= "1.1.5" 37PREFERRED_VERSION_libx11 ?= "1.1.99.1+git${SRCREV}"
38PREFERRED_VERSION_libx11-diet ?= "1.1.5" 38PREFERRED_VERSION_libx11-diet ?= "1.1.5"
39PREFERRED_VERSION_libx11-native ?= "1.1.5" 39PREFERRED_VERSION_libx11-native ?= "1.1.5"
40PREFERRED_VERSION_libx11-sdk ?= "1.1.5" 40PREFERRED_VERSION_libx11-sdk ?= "1.1.5"
@@ -50,14 +50,14 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" 50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2" 51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2"
52PREFERRED_VERSION_libxevie ?= "1.0.2" 52PREFERRED_VERSION_libxevie ?= "1.0.2"
53PREFERRED_VERSION_libxext ?= "1.0.4" 53PREFERRED_VERSION_libxext ?= "1.0.99.1+git${SRCREV}"
54PREFERRED_VERSION_libxext-sdk ?= "1.0.4" 54PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+git${SRCREV}""
55PREFERRED_VERSION_libxfixes ?= "4.0.3" 55PREFERRED_VERSION_libxfixes ?= "4.0.3"
56PREFERRED_VERSION_libxfont ?= "1.3.3" 56PREFERRED_VERSION_libxfont ?= "1.3.3"
57PREFERRED_VERSION_libxfont-native ?= "1.3.2" 57PREFERRED_VERSION_libxfont-native ?= "1.3.2"
58PREFERRED_VERSION_libxfontcache ?= "1.0.4" 58PREFERRED_VERSION_libxfontcache ?= "1.0.4"
59PREFERRED_VERSION_libxft ?= "2.1.12" 59PREFERRED_VERSION_libxft ?= "2.1.12"
60PREFERRED_VERSION_libxi ?= "1.1.3" 60PREFERRED_VERSION_libxi ?= "1.1.99.1+git${SRCREV}"
61PREFERRED_VERSION_libxinerama ?= "1.0.3" 61PREFERRED_VERSION_libxinerama ?= "1.0.3"
62PREFERRED_VERSION_libxkbfile ?= "1.0.5" 62PREFERRED_VERSION_libxkbfile ?= "1.0.5"
63PREFERRED_VERSION_libxkbui ?= "1.0.2" 63PREFERRED_VERSION_libxkbui ?= "1.0.2"
@@ -138,8 +138,8 @@ PREFERRED_VERSION_xvinfo ?= "1.0.2"
138PREFERRED_VERSION_xwininfo ?= "1.0.3" 138PREFERRED_VERSION_xwininfo ?= "1.0.3"
139PREFERRED_VERSION_mesa-dri ?= "7.2" 139PREFERRED_VERSION_mesa-dri ?= "7.2"
140PREFERRED_VERSION_libdrm ?= "2.3.1" 140PREFERRED_VERSION_libdrm ?= "2.3.1"
141PREFERRED_VERSION_xcb-proto ?= "1.0" 141PREFERRED_VERSION_xcb-proto ?= "1.2"
142PREFERRED_VERSION_libxcb ?= "1.0" 142PREFERRED_VERSION_libxcb ?= "1.1.90.1+git${SRCREV}"
143PREFERRED_VERSION_libpciaccess ?= "0.10.3" 143PREFERRED_VERSION_libpciaccess ?= "0.10.3"
144PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" 144PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
145PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0" 145PREFERRED_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 @@
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