* fu will das so

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6705 33e552b5-05e3-0310-8538-816dae2090ed

6 files changed, 12 insertions, 10 deletions

diff --git a/rules/host-xorg-lib-X11.in b/rules/host-xorg-lib-X11.in
index a4e344814..9d1cd778a 100644
--- a/rules/host-xorg-lib-X11.in
+++ b/rules/host-xorg-lib-X11.in
@@ -1,12 +1,15 @@
 config HOST_XORG_LIB_X11
 	bool
 	select HOST_XORG_PROTO_X
-	select HOST_XORG_LIB_XAU
-	select HOST_XORG_PROTO_BIGREQS	# FIXME Why always?
+
 	select HOST_XORG_PROTO_XEXT
 	select HOST_XORG_LIB_XTRANS
+	select HOST_XORG_LIB_XAU
 	select HOST_XORG_PROTO_XCMISC
-	select HOST_XORG_LIB_XDMCP	# FIXME Why always?
+	select HOST_XORG_PROTO_BIGREQS
+
+	select HOST_XORG_LIB_XDMCP
+
 	select HOST_XORG_PROTO_KB
 	select HOST_XORG_PROTO_INPUT
 
diff --git a/rules/host-xorg-lib-Xfont.in b/rules/host-xorg-lib-Xfont.in
index 05763146b..f4fef927c 100644
--- a/rules/host-xorg-lib-Xfont.in
+++ b/rules/host-xorg-lib-Xfont.in
@@ -1,5 +1,6 @@
 config HOST_XORG_LIB_XFONT
 	bool
+	select HOST_ZLIB
 	select HOST_XORG_PROTO_X
 	select HOST_XORG_PROTO_FONTS
 	select HOST_XORG_LIB_FONTENC
diff --git a/rules/host-xorg-lib-Xfont.make b/rules/host-xorg-lib-Xfont.make
index f8dced1a6..f8edccd2c 100644
--- a/rules/host-xorg-lib-Xfont.make
+++ b/rules/host-xorg-lib-Xfont.make
@@ -59,8 +59,6 @@ HOST_XORG_LIB_XFONT_AUTOCONF := \
 	--disable-freetype \
 	--disable-fontcache
 
-#	--disable-fc
-
 $(STATEDIR)/host-xorg-lib-xfont.prepare: $(host-xorg-lib-xfont_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_XORG_LIB_XFONT_DIR)/config.cache)
diff --git a/rules/host-xorg-lib-fontenc.in b/rules/host-xorg-lib-fontenc.in
index 4ce7188c6..27b7a829d 100644
--- a/rules/host-xorg-lib-fontenc.in
+++ b/rules/host-xorg-lib-fontenc.in
@@ -2,4 +2,3 @@ config HOST_XORG_LIB_FONTENC
 	bool
 	select HOST_ZLIB
 	select HOST_XORG_PROTO_X
-	select HOST_FREETYPE
diff --git a/rules/xorg-app-mkfontdir.in b/rules/xorg-app-mkfontdir.in
index b6bba7a00..3de0f387a 100644
--- a/rules/xorg-app-mkfontdir.in
+++ b/rules/xorg-app-mkfontdir.in
@@ -1,6 +1,7 @@
 config XORG_APP_MKFONTDIR
 	bool
 	depends on XORG_APP
+	select XORG_APP_MKFONTSCALE
 	prompt "xorg mkfontdir"
 	help
 	  Create an index of scalable font files for X
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index 0e3a19707..61b3b65a3 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONT) += xorg-lib-xfont
 #
 # Paths and names
 #
-XORG_LIB_XFONT_VERSION	:= 1.1.0
-XORG_LIB_XFONT		:= libXfont-X11R7.1-$(XORG_LIB_XFONT_VERSION)
+XORG_LIB_XFONT_VERSION	:= 1.2.6
+XORG_LIB_XFONT		:= libXfont-$(XORG_LIB_XFONT_VERSION)
 XORG_LIB_XFONT_SUFFIX	:= tar.bz2
-XORG_LIB_XFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
+XORG_LIB_XFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
 XORG_LIB_XFONT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
 XORG_LIB_XFONT_DIR	:= $(BUILDDIR)/$(XORG_LIB_XFONT)
 
@@ -168,7 +168,7 @@ xorg-lib-xfont_compile: $(STATEDIR)/xorg-lib-xfont.compile
 
 $(STATEDIR)/xorg-lib-xfont.compile: $(xorg-lib-xfont_compile_deps_default)
 	@$(call targetinfo, $@)
-	cd $(XORG_LIB_XFONT_DIR) && $(XORG_LIB_XFONT_PATH) make
+	cd $(XORG_LIB_XFONT_DIR) && $(XORG_LIB_XFONT_PATH) $(MAKE) $(PARALLELMFLAGS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------