diff options
-rw-r--r-- | rules/host-xorg-lib-Xfont.make | 3 | ||||
-rw-r--r-- | rules/xorg-lib-Xfont.in | 10 | ||||
-rw-r--r-- | rules/xorg-lib-Xfont.make | 6 | ||||
-rw-r--r-- | rules/xorg-proto-fontcache.in | 6 | ||||
-rw-r--r-- | rules/xorg-proto-fontcache.make | 120 | ||||
-rw-r--r-- | rules/xorg-server.in | 2 | ||||
-rw-r--r-- | rules/xorg-server.make | 9 |
7 files changed, 1 insertions, 155 deletions
diff --git a/rules/host-xorg-lib-Xfont.make b/rules/host-xorg-lib-Xfont.make index f8edccd2c..96b3f7cfa 100644 --- a/rules/host-xorg-lib-Xfont.make +++ b/rules/host-xorg-lib-Xfont.make @@ -56,8 +56,7 @@ HOST_XORG_LIB_XFONT_ENV := $(HOST_ENV) # HOST_XORG_LIB_XFONT_AUTOCONF := \ $(HOST_AUTOCONF) \ - --disable-freetype \ - --disable-fontcache + --disable-freetype $(STATEDIR)/host-xorg-lib-xfont.prepare: $(host-xorg-lib-xfont_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in index 136a809bf..a35b6f0b8 100644 --- a/rules/xorg-lib-Xfont.in +++ b/rules/xorg-lib-Xfont.in @@ -13,7 +13,6 @@ menuconfig XORG_LIB_XFONT select XORG_LIB_XTRANS select ZLIB if XORG_LIB_XFONT_BUILTIN_FONTS select FREETYPE if XORG_LIB_XFONT_FREETYPE - select XORG_PROTO_FONTCACHE if XORG_LIB_XFONT_FONTCACHE default y if XORG_LIB_X11 prompt "libXfont " help @@ -28,15 +27,6 @@ config XORG_LIB_XFONT_FREETYPE help This will enable freetype 2.x library. -config XORG_LIB_XFONT_FONTCACHE - depends on XORG_LIB_XFONT - depends on XORG_LIB_XFONTCACHE - bool - default y - prompt "Use fontcache" - help - This will enable fontcache support - config XORG_LIB_XFONT_FONTSERVER depends on XORG_LIB_XFONT bool diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make index 89f08759c..aa2ad9e52 100644 --- a/rules/xorg-lib-Xfont.make +++ b/rules/xorg-lib-Xfont.make @@ -78,12 +78,6 @@ else XORG_LIB_XFONT_AUTOCONF += --disable-freetype endif -ifdef PTXCONF_XORG_LIB_XFONT_FONTCACHE -XORG_LIB_XFONT_AUTOCONF += --enable-fontcache -else -XORG_LIB_XFONT_AUTOCONF += --disable-fontcache -endif - ifdef PTXCONF_XORG_LIB_XFONT_FONTSERVER XORG_LIB_XFONT_AUTOCONF += --enable-fc else diff --git a/rules/xorg-proto-fontcache.in b/rules/xorg-proto-fontcache.in deleted file mode 100644 index 7d0d18307..000000000 --- a/rules/xorg-proto-fontcache.in +++ /dev/null @@ -1,6 +0,0 @@ -## SECTION=multimedia_xorg_proto - -config XORG_PROTO_FONTCACHE - tristate - help - FIXME diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make deleted file mode 100644 index 294e1617b..000000000 --- a/rules/xorg-proto-fontcache.make +++ /dev/null @@ -1,120 +0,0 @@ -# -*-makefile-*- -# $Id: template 4565 2006-02-10 14:23:10Z mkl $ -# -# Copyright (C) 2006 by Erwin Rol -# (C) 2009 by Robert Schwebel -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_XORG_PROTO_FONTCACHE) += xorg-proto-fontcache - -# -# Paths and names -# -XORG_PROTO_FONTCACHE_VERSION := 0.1.3 -XORG_PROTO_FONTCACHE := fontcacheproto-$(XORG_PROTO_FONTCACHE_VERSION) -XORG_PROTO_FONTCACHE_SUFFIX := tar.bz2 -XORG_PROTO_FONTCACHE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX) -XORG_PROTO_FONTCACHE_SOURCE := $(SRCDIR)/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX) -XORG_PROTO_FONTCACHE_DIR := $(BUILDDIR)/$(XORG_PROTO_FONTCACHE) - - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_get: $(STATEDIR)/xorg-proto-fontcache.get - -$(STATEDIR)/xorg-proto-fontcache.get: $(xorg-proto-fontcache_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -$(XORG_PROTO_FONTCACHE_SOURCE): - @$(call targetinfo, $@) - @$(call get, XORG_PROTO_FONTCACHE) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_extract: $(STATEDIR)/xorg-proto-fontcache.extract - -$(STATEDIR)/xorg-proto-fontcache.extract: $(xorg-proto-fontcache_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_PROTO_FONTCACHE_DIR)) - @$(call extract, XORG_PROTO_FONTCACHE) - @$(call patchin, XORG_PROTO_FONTCACHE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_prepare: $(STATEDIR)/xorg-proto-fontcache.prepare - -XORG_PROTO_FONTCACHE_PATH := PATH=$(CROSS_PATH) -XORG_PROTO_FONTCACHE_ENV := $(CROSS_ENV) - -# -# autoconf -# -XORG_PROTO_FONTCACHE_AUTOCONF := $(CROSS_AUTOCONF_USR) - -$(STATEDIR)/xorg-proto-fontcache.prepare: $(xorg-proto-fontcache_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(XORG_PROTO_FONTCACHE_DIR)/config.cache) - cd $(XORG_PROTO_FONTCACHE_DIR) && \ - $(XORG_PROTO_FONTCACHE_PATH) $(XORG_PROTO_FONTCACHE_ENV) \ - ./configure $(XORG_PROTO_FONTCACHE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_compile: $(STATEDIR)/xorg-proto-fontcache.compile - -$(STATEDIR)/xorg-proto-fontcache.compile: $(xorg-proto-fontcache_compile_deps_default) - @$(call targetinfo, $@) - cd $(XORG_PROTO_FONTCACHE_DIR) && $(XORG_PROTO_FONTCACHE_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_install: $(STATEDIR)/xorg-proto-fontcache.install - -$(STATEDIR)/xorg-proto-fontcache.install: $(xorg-proto-fontcache_install_deps_default) - @$(call targetinfo, $@) - @$(call install, XORG_PROTO_FONTCACHE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_targetinstall: $(STATEDIR)/xorg-proto-fontcache.targetinstall - -$(STATEDIR)/xorg-proto-fontcache.targetinstall: $(xorg-proto-fontcache_targetinstall_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -xorg-proto-fontcache_clean: - rm -rf $(STATEDIR)/xorg-proto-fontcache.* - rm -rf $(PKGDIR)/xorg-proto-fontcache_* - rm -rf $(XORG_PROTO_FONTCACHE_DIR) - -# vim: syntax=make - diff --git a/rules/xorg-server.in b/rules/xorg-server.in index 8aaaf958e..cf2887ef5 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -94,11 +94,9 @@ menuconfig XORG_SERVER #select XORG_PROTO_XF86MISC #select XORG_PROTO_XF86BIGFONT #select LIBC_DL - #select XORG_LIB_XFONTCACHE #select XORG_LIB_XT #select XORG_LIB_XMU #select XORG_LIB_XTST - #select XORG_PROTO_FONTCACHE #select XORG_LIB_XKBUI if XORG_KEYBOARD_MAPPING_SUPPORT #select XORG_PROTO_EVIEEXT if XORG_SERVER_EXT_XEVIE #select XORG_PROTO_DMX if XORG_SERVER_EXT_XDMCP diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 81d4cac39..430f2b4f6 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -365,12 +365,6 @@ endif #XORG_SERVER_AUTOCONF += --disable-evi #endif # -#ifdef PTXCONF_XORG_SERVER_EXT_FONTCACHE -#XORG_SERVER_AUTOCONF += --enable-fontcache -#else -#XORG_SERVER_AUTOCONF += --disable-fontcache -#endif -# #ifdef PTXCONF_FREETYPE #XORG_SERVER_AUTOCONF += --enable-freetype #else @@ -585,9 +579,6 @@ endif ifdef PTXCONF_XORG_SERVER_EXT_MULTIBUFFER endif -ifdef PTXCONF_XORG_SERVER_EXT_FONTCACHE -endif - ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC endif |