summaryrefslogtreecommitdiff
path: root/package/fontconfig
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-06 18:09:37 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-06 18:09:37 +0000
commit759200ecb1f5fb56b0dcf07337b5fa947e98e06c (patch)
treec853ac1b70fc1a528751205ad25a998a23cf6ae3 /package/fontconfig
parent703d58a4f5346c23a1dda47eec70b36df1d8b849 (diff)
updated fontconfig
Diffstat (limited to 'package/fontconfig')
-rw-r--r--package/fontconfig/Config.in3
-rw-r--r--package/fontconfig/fontconfig-2.4.2-fc-lang.patch (renamed from package/fontconfig/fc-lang.patch)0
-rw-r--r--package/fontconfig/fontconfig-2.4.2-host-tools.patch (renamed from package/fontconfig/host-tools.patch)0
-rw-r--r--package/fontconfig/fontconfig-2.4.2-libdir-la.patch (renamed from package/fontconfig/libdir-la.patch)0
-rw-r--r--package/fontconfig/fontconfig.mk110
5 files changed, 22 insertions, 91 deletions
diff --git a/package/fontconfig/Config.in b/package/fontconfig/Config.in
index 77f91e175..b483298f2 100644
--- a/package/fontconfig/Config.in
+++ b/package/fontconfig/Config.in
@@ -4,5 +4,6 @@ config BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_EXPAT
default n
help
-
+ a library for font customization and configuration.
+
http://www.fontconfig.org/
diff --git a/package/fontconfig/fc-lang.patch b/package/fontconfig/fontconfig-2.4.2-fc-lang.patch
index d4d10db67..d4d10db67 100644
--- a/package/fontconfig/fc-lang.patch
+++ b/package/fontconfig/fontconfig-2.4.2-fc-lang.patch
diff --git a/package/fontconfig/host-tools.patch b/package/fontconfig/fontconfig-2.4.2-host-tools.patch
index 7b434adef..7b434adef 100644
--- a/package/fontconfig/host-tools.patch
+++ b/package/fontconfig/fontconfig-2.4.2-host-tools.patch
diff --git a/package/fontconfig/libdir-la.patch b/package/fontconfig/fontconfig-2.4.2-libdir-la.patch
index 672e96d4b..672e96d4b 100644
--- a/package/fontconfig/libdir-la.patch
+++ b/package/fontconfig/fontconfig-2.4.2-libdir-la.patch
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
index 9798849ae..394bd580a 100644
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -3,99 +3,29 @@
# fontconfig
#
#############################################################
-FONTCONFIG_VERSION:=2.4.2
-FONTCONFIG_SOURCE:=fontconfig-$(FONTCONFIG_VERSION).tar.gz
-FONTCONFIG_SITE:=http://fontconfig.org/release
-FONTCONFIG_CAT:=$(ZCAT)
-FONTCONFIG_DIR:=$(BUILD_DIR)/fontconfig-$(FONTCONFIG_VERSION)
-
-$(DL_DIR)/$(FONTCONFIG_SOURCE):
- $(WGET) -P $(DL_DIR) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE)
-
-fontconfig-source: $(DL_DIR)/$(FONTCONFIG_SOURCE)
-
-$(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE)
- $(FONTCONFIG_CAT) $(DL_DIR)/$(FONTCONFIG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FONTCONFIG_DIR) package/fontconfig/ \*.patch*
-# use freetype-host for host tools
- FREETYPE_CFLAGS="$(shell $(FREETYPE_HOST_DIR)/bin/freetype-config --cflags)"; \
- FREETYPE_LIBS="$(shell $(FREETYPE_HOST_DIR)/bin/freetype-config --libs)"; \
- for dir in fc-case fc-glyphname fc-lang fc-arch; \
- do \
- $(SED) "s~^FREETYPE_CFLAGS =.*~FREETYPE_CFLAGS = $$FREETYPE_CFLAGS~" \
- -e "s~^FREETYPE_LIBS =.*~FREETYPE_LIBS = $$FREETYPE_LIBS~" \
- $(FONTCONFIG_DIR)/$$dir/Makefile.in; \
- done
- $(CONFIG_UPDATE) $(FONTCONFIG_DIR)
- touch $@
-
-$(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked
- (cd $(FONTCONFIG_DIR); rm -rf config.cache; \
- $(AUTORECONF) && \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CFLAGS_FOR_BUILD="-I$(FREETYPE_HOST_DIR)/include/freetype2 -I$(FREETYPE_HOST_DIR)/include" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --with-arch=$(GNU_TARGET_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
+FONTCONFIG_VERSION = 2.4.2
+FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
+FONTCONFIG_SITE = http://fontconfig.org/release
+FONTCONFIG_AUTORECONF = NO
+FONTCONFIG_INSTALL_STAGING = YES
+FONTCONFIG_INSTALL_TARGET = YES
+
+FONTCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+FONTCONFIG_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) --with-arch=$(GNU_TARGET_NAME) \
+ --prefix=/usr --exec-prefix=/usr \
+ --bindir=/usr/bin --sbindir=/usr/sbin \
+ --libdir=/usr/lib --libexecdir=/usr/lib \
+ --sysconfdir=/etc --datadir=/usr/share \
+ --localstatedir=/var --includedir=/usr/include \
+ --mandir=/usr/man --infodir=/usr/info \
--with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \
--with-expat="$(STAGING_DIR)/usr/lib" \
--with-expat-lib=$(STAGING_DIR)/usr/lib \
--with-expat-includes=$(STAGING_DIR)/usr/include \
- --disable-docs \
- )
- touch $@
-
-$(FONTCONFIG_DIR)/.compiled: $(FONTCONFIG_DIR)/.configured
- $(MAKE) -C $(FONTCONFIG_DIR)
- touch $@
-
-$(STAGING_DIR)/usr/lib/libfontconfig.so: $(FONTCONFIG_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FONTCONFIG_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libfontconfig.la
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libfontconfig.so: $(STAGING_DIR)/usr/lib/libfontconfig.so
- cp -dpf $(STAGING_DIR)/usr/lib/libfontconfig.so* $(TARGET_DIR)/usr/lib/
- mkdir -p $(TARGET_DIR)/etc/fonts
- cp $(STAGING_DIR)/etc/fonts/fonts.conf $(TARGET_DIR)/etc/fonts/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfontconfig.so
- mkdir -p $(TARGET_DIR)/var/cache/fontconfig
- mkdir -p $(TARGET_DIR)/usr/bin
- cp -a $(STAGING_DIR)/usr/bin/fc-cache $(TARGET_DIR)/usr/bin/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-cache
- cp -a $(STAGING_DIR)/usr/bin/fc-list $(TARGET_DIR)/usr/bin/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/fc-list
- touch -c $@
+ --disable-docs
-fontconfig: uclibc freetype host-freetype expat $(TARGET_DIR)/usr/lib/libfontconfig.so
+FONTCONFIG_DEPENDENCIES = uclibc freetype expat
-fontconfig-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FONTCONFIG_DIR) uninstall
- -$(MAKE) -C $(FONTCONFIG_DIR) clean
-
-fontconfig-dirclean:
- rm -rf $(FONTCONFIG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FONTCONFIG)),y)
-TARGETS+=fontconfig
-endif
+$(eval $(call AUTOTARGETS,package,fontconfig))