xorg: remove fontcache support

This was removed from the Xorg server in 2008.

(From OE-Core rev: 02fc0a197ca16e983becb0aedeb9238a0aeb6661)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 3 insertions, 38 deletions

diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
index dde2ced3c4..7830019cf9 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.2.bb
@@ -7,8 +7,8 @@ preference options of the display."
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
-DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxau"
-PR = "${INC_PR}.1"
+DEPENDS += "libxext libxxf86misc libxmu libxau"
+PR = "${INC_PR}.2"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
@@ -17,4 +17,4 @@ SRC_URI[md5sum] = "d44e0057d6722b25d5a314e82e0b7e7c"
 SRC_URI[sha256sum] = "61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8"
 
 CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--disable-xkb"
+EXTRA_OECONF = "--disable-xkb --without-fontcache"
diff --git a/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
deleted file mode 100644
index 065daf1187..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxfontcache_1.0.5.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require xorg-lib-common.inc
-
-SUMMARY = "XFontCache: X Font Cache extension library"
-
-DESCRIPTION = "FontCache is an extension that is used by X-TrueType to cache \
-information about fonts."
-
-DEPENDS += "libxext fontcacheproto zlib"
-LIC_FILES_CHKSUM = "file://COPYING;md5=62a75d5d3da40f1f6eb1cbe3bcc0a5d0"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXfontcache"
-
-SRC_URI[md5sum] = "bbd37768c87f63cf2eb845b2c0f56515"
-SRC_URI[sha256sum] = "0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce"
diff --git a/meta/recipes-graphics/xorg-proto/fontcacheproto_0.1.3.bb b/meta/recipes-graphics/xorg-proto/fontcacheproto_0.1.3.bb
deleted file mode 100644
index 42c95882b9..0000000000
--- a/meta/recipes-graphics/xorg-proto/fontcacheproto_0.1.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XFontCache: X Font Cache extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Font \
-Cache extension.  This extension is used by X-TrueType to cache \
-information about fonts."
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ba9fcd8fe6d09af9f733daccc1a21857 \
-                    file://fontcacheP.h;endline=28;md5=85c80bfa96c802ee85a570862ee60214"
-
-PR = "r1"
-PE = "1"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "a8a50e5e995bfacb0359575faf7f6906"
-SRC_URI[sha256sum] = "1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb"