summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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
9inherit siteinfo 9inherit siteinfo
10 10
11PE = "1" 11PE = "1"
12INC_PR = "r1" 12INC_PR = "r2"
13 13
14PROVIDES = "virtual/libx11" 14PROVIDES = "virtual/libx11"
15 15
@@ -17,8 +17,6 @@ XORG_PN = "libX11"
17LICENSE = "MIT & MIT-style & BSD" 17LICENSE = "MIT & MIT-style & BSD"
18LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 18LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
19 19
20EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
21
22PACKAGES =+ "${PN}-xcb" 20PACKAGES =+ "${PN}-xcb"
23 21
24FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" 22FILES_${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 \
14DEPENDS += "libxext inputproto" 14DEPENDS += "libxext inputproto"
15 15
16PE = "1" 16PE = "1"
17PR = "r0" 17PR = "r1"
18 18
19XORG_PN = "libXi" 19XORG_PN = "libXi"
20 20
21EXTRA_OECONF_append = " --enable-specs=no"
22
23SRC_URI[md5sum] = "78ee882e1ff3b192cf54070bdb19938e" 21SRC_URI[md5sum] = "78ee882e1ff3b192cf54070bdb19938e"
24SRC_URI[sha256sum] = "f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109" 22SRC_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}"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" 16EXTRA_OECONF = "--enable-malloc0returnsnull \
17 --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto"
17 18
18python () { 19python () {
19 whitelist = [ "pixman", "libpciaccess" ] 20 whitelist = [ "pixman", "libpciaccess" ]