summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:17:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:48 +0100
commit84279136fe4c268bd8ea2ff76c1e501f8b9e3976 (patch)
treeefc259f299a4f87e51af245623cf863e1e982ba2 /meta/recipes-graphics/xorg-lib
parentd7a03d5bd066bc22eddaf9f7aba8c995227ab3a7 (diff)
downloadpoky-84279136fe4c268bd8ea2ff76c1e501f8b9e3976.tar.gz
libx11: refresh dependencies, and centralise into libx11.inc
(From OE-Core rev: a66e6a7765525d3e18cd81b68c422b3dab81d498) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc5
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb5
4 files changed, 4 insertions, 11 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 04ee1b89fc..50000ab882 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -18,9 +18,6 @@ RPROVIDES_${PN}-locale = "libx11-locale"
18SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 18SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
19SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 19SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
20 20
21DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
22 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
23
24FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" 21FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
25 22
26EXTRA_OECONF += "--disable-xlocale" 23EXTRA_OECONF += "--disable-xlocale"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 65509031fe..6619946c4c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -4,8 +4,6 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
4 4
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6 6
7DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
8
9SRC_URI += "file://x11_disable_makekeys.patch \ 7SRC_URI += "file://x11_disable_makekeys.patch \
10 file://keysymdef_include.patch \ 8 file://keysymdef_include.patch \
11 file://makekeys_crosscompile.patch" 9 file://makekeys_crosscompile.patch"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 1e9f9423f0..85fdbe7dd9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ inherit siteinfo
11FILESPATH = "${FILE_DIRNAME}/libx11" 11FILESPATH = "${FILE_DIRNAME}/libx11"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r5" 14INC_PR = "r6"
15 15
16PROVIDES = "virtual/libx11" 16PROVIDES = "virtual/libx11"
17 17
@@ -19,6 +19,9 @@ XORG_PN = "libX11"
19LICENSE = "MIT & MIT-style & BSD" 19LICENSE = "MIT & MIT-style & BSD"
20LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 20LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
21 21
22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
23DEPENDS += "xf86bigfontproto xproto-native"
24
22PACKAGES =+ "${PN}-xcb" 25PACKAGES =+ "${PN}-xcb"
23 26
24FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" 27FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 0ba0f9b0d6..c138785640 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -5,11 +5,6 @@ PR = "${INC_PR}.0"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7
8DEPENDS += "util-macros xtrans libxdmcp libxau \
9 bigreqsproto xproto xextproto xcmiscproto \
10 xf86bigfontproto kbproto inputproto libxcb \
11 xproto-native"
12
13SRC_URI += " file://keysymdef_include.patch \ 8SRC_URI += " file://keysymdef_include.patch \
14 file://x11_disable_makekeys.patch \ 9 file://x11_disable_makekeys.patch \
15 file://makekeys_crosscompile.patch \ 10 file://makekeys_crosscompile.patch \