summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc9
-rw-r--r--meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb18
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc2
3 files changed, 5 insertions, 24 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 97bd1c20fa..71e74f77dc 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 = "r9" 14INC_PR = "r10"
15 15
16PROVIDES = "virtual/libx11" 16PROVIDES = "virtual/libx11"
17 17
@@ -22,14 +22,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" 22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
23DEPENDS += "xproto-native" 23DEPENDS += "xproto-native"
24 24
25EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" 25EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
26EXTRA_OEMAKE += 'CWARNFLAGS=""' 26EXTRA_OEMAKE += 'CWARNFLAGS=""'
27 27
28# Let people with incredibly archaic requirements enable Xcms and BigFont, but 28# Let people with incredibly archaic requirements enable Xcms, but disable it by
29# disable them by default. 29# default.
30PACKAGECONFIG ??= "" 30PACKAGECONFIG ??= ""
31PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" 31PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
32PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
33 32
34# src/util/makekeys needs to be compiled natively, so tell it what compiler to 33# src/util/makekeys needs to be compiled natively, so tell it what compiler to
35# use. 34# use.
diff --git a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
deleted file mode 100644
index 969fc91364..0000000000
--- a/meta/recipes-graphics/xorg-proto/xf86bigfontproto_1.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1require xorg-proto-common.inc
2
3SUMMARY = "XFree86-BIGFONT: XFree86 Big Font extension headers"
4
5DESCRIPTION = "This package provides the wire protocol for the XFree86 \
6Big Font extension. This extension makes larger font requests \
7possible."
8
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
11
12PR = "r1"
13PE = "1"
14
15BBCLASSEXTEND = "native nativesdk"
16
17SRC_URI[md5sum] = "120e226ede5a4687b25dd357cc9b8efe"
18SRC_URI[sha256sum] = "ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 772fa52ee0..b45cb4429d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
23 23
24inherit autotools pkgconfig 24inherit autotools pkgconfig
25 25
26PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" 26PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
27LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" 27LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
28DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 28DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
29 29