diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-12 21:53:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-13 00:24:24 +0200 |
| commit | ac4643d6fab72507c08b0f2619b7e77dc6692885 (patch) | |
| tree | 4e497dff7c311ba507db7bf035eb4c4f6490339a /rules/xorg-lib-Xfont.make | |
| parent | d3d81a9a3e3df1ae3f2fa44265ce8265d18575a6 (diff) | |
| download | ptxdist-ac4643d6fab72507c08b0f2619b7e77dc6692885.tar.gz ptxdist-ac4643d6fab72507c08b0f2619b7e77dc6692885.tar.xz | |
xorg-lib-xfont: version bump 1.4.3 -> 1.4.5
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-lib-Xfont.make')
| -rw-r--r-- | rules/xorg-lib-Xfont.make | 70 |
1 files changed, 14 insertions, 56 deletions
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make index 6d218ecd7..4b8ea02fc 100644 --- a/rules/xorg-lib-Xfont.make +++ b/rules/xorg-lib-Xfont.make @@ -16,77 +16,35 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONT) += xorg-lib-xfont # # Paths and names # -XORG_LIB_XFONT_VERSION := 1.4.3 -XORG_LIB_XFONT_MD5 := 6fb689cfe13d8d9460f4abb5bd88588d +XORG_LIB_XFONT_VERSION := 1.4.5 +XORG_LIB_XFONT_MD5 := 6851da5dae0a6cf5f7c9b9e2b05dd3b4 XORG_LIB_XFONT := libXfont-$(XORG_LIB_XFONT_VERSION) XORG_LIB_XFONT_SUFFIX := tar.bz2 XORG_LIB_XFONT_URL := $(call ptx/mirror, XORG, 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) - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(XORG_LIB_XFONT_SOURCE): - @$(call targetinfo) - @$(call get, XORG_LIB_XFONT) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -XORG_LIB_XFONT_PATH := PATH=$(CROSS_PATH) -XORG_LIB_XFONT_ENV := $(CROSS_ENV) - # # autoconf # -XORG_LIB_XFONT_AUTOCONF := \ +XORG_LIB_XFONT_CONF_TOOL := autoconf +XORG_LIB_XFONT_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --disable-devel-docs \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_FREETYPE)-freetype \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_BUILTIN_FONTS)-builtins \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_PCF_FONTS)-pcfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_BDF_FONTS)-bdfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_SNF_FONTS)-snfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT_FONTSERVER)-fc \ $(XORG_OPTIONS_TRANS) \ - --without-xmlto - -# -# Use the global switch here to support freetype when -# its present in the system -# -ifdef PTXCONF_XORG_LIB_XFONT_FREETYPE -XORG_LIB_XFONT_AUTOCONF += --enable-freetype -else -XORG_LIB_XFONT_AUTOCONF += --disable-freetype -endif - -ifdef PTXCONF_XORG_LIB_XFONT_FONTSERVER -XORG_LIB_XFONT_AUTOCONF += --enable-fc -else -XORG_LIB_XFONT_AUTOCONF += --disable-fc -endif - -ifdef PTXCONF_XORG_LIB_XFONT_PCF_FONTS -XORG_LIB_XFONT_AUTOCONF += --enable-pcfformat -else -XORG_LIB_XFONT_AUTOCONF += --disable-pcfformat -endif - -ifdef PTXCONF_XORG_LIB_XFONT_BDF_FONTS -XORG_LIB_XFONT_AUTOCONF += --enable-bdfformat -else -XORG_LIB_XFONT_AUTOCONF += --disable-bdfformat -endif - -ifdef PTXCONF_XORG_LIB_XFONT_SNF_FONTS -XORG_LIB_XFONT_AUTOCONF += --enable-snfformat -else -XORG_LIB_XFONT_AUTOCONF += --disable-snfformat -endif - -ifdef PTXCONF_XORG_LIB_XFONT_BUILTIN_FONTS -XORG_LIB_XFONT_AUTOCONF += --enable-builtins -else -XORG_LIB_XFONT_AUTOCONF += --disable-builtins -endif + --without-xmlto \ + --without-fop \ + --without-bzip2 # ---------------------------------------------------------------------------- # Target-Install |