diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-09-11 20:17:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:46 +0100 |
| commit | 85816c84eb929954447a9abbea1e473351a71c50 (patch) | |
| tree | 0bb3268df67de6f661bfd548bae93e0087311a5d /meta/recipes-graphics | |
| parent | 8071888705d203a6903de44eaca295034b846e33 (diff) | |
| download | ast2050-yocto-poky-85816c84eb929954447a9abbea1e473351a71c50.zip ast2050-yocto-poky-85816c84eb929954447a9abbea1e473351a71c50.tar.gz | |
xorg-lib: move options to disable documentation to xorg-lib-common
(From OE-Core rev: aee98f2ccab4bfff2aca031c2374274f945982f5)
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.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 3 |
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 9e8c863..fb1daf2 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 575d130..c327f25 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 55eaf49..c911925 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" ] |
