summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:17:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 14:52:08 +0100
commitaee98f2ccab4bfff2aca031c2374274f945982f5 (patch)
tree88ca15a9dde3f7f2a0c738cc9dfebd9d5235c0b4 /meta/recipes-graphics
parentbb2c59d3efdd94d7cc0cd47daa3429a1521ca8ac (diff)
downloadopenembedded-core-aee98f2ccab4bfff2aca031c2374274f945982f5.tar.gz
openembedded-core-aee98f2ccab4bfff2aca031c2374274f945982f5.tar.bz2
openembedded-core-aee98f2ccab4bfff2aca031c2374274f945982f5.zip
xorg-lib: move options to disable documentation to xorg-lib-common
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-lib/xorg-lib-common.inc3
3 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 9e8c863589..fb1daf2e0a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
inherit siteinfo
PE = "1"
-INC_PR = "r1"
+INC_PR = "r2"
PROVIDES = "virtual/libx11"
@@ -17,8 +17,6 @@ XORG_PN = "libX11"
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
-
PACKAGES =+ "${PN}-xcb"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
index 575d1301ed..c327f2555d 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb
@@ -14,11 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \
DEPENDS += "libxext inputproto"
PE = "1"
-PR = "r0"
+PR = "r1"
XORG_PN = "libXi"
-EXTRA_OECONF_append = " --enable-specs=no"
-
SRC_URI[md5sum] = "78ee882e1ff3b192cf54070bdb19938e"
SRC_URI[sha256sum] = "f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109"
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 55eaf49a38..c911925505 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -13,7 +13,8 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto"
+EXTRA_OECONF = "--enable-malloc0returnsnull \
+ --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto"
python () {
whitelist = [ "pixman", "libpciaccess" ]