From 4e9349fd6635a5010665a8fe3ccd476cfeee86bd Mon Sep 17 00:00:00 2001 From: John Voltz Date: Thu, 6 Mar 2008 18:09:59 +0000 Subject: [PATCH] updated freetype --- package/freetype/Config.in | 1 + ...a.patch => freetype-2.2.1-libdir-la.patch} | 0 package/freetype/freetype.mk | 137 +++--------------- 3 files changed, 22 insertions(+), 116 deletions(-) rename package/freetype/{libdir-la.patch => freetype-2.2.1-libdir-la.patch} (100%) diff --git a/package/freetype/Config.in b/package/freetype/Config.in index 515dd15111..4f08b97b87 100644 --- a/package/freetype/Config.in +++ b/package/freetype/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FREETYPE bool "freetype" default n help + a free, high-quality and portable font engine. http://www.freetype.org/ diff --git a/package/freetype/libdir-la.patch b/package/freetype/freetype-2.2.1-libdir-la.patch similarity index 100% rename from package/freetype/libdir-la.patch rename to package/freetype/freetype-2.2.1-libdir-la.patch diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 17edebdb84..e4d0529f03 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -3,119 +3,24 @@ # freetype # ############################################################# -FREETYPE_VERSION:=$(strip $(subst ",, $(BR2_FREETYPE_VERSION))) -FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2 -FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype -FREETYPE_CAT:=$(BZCAT) -FREETYPE_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION) -FREETYPE_DIR1:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION) -FREETYPE_HOST_DIR:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)-host - -$(DL_DIR)/$(FREETYPE_SOURCE): - $(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE) - -$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) - $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(CONFIG_UPDATE) $(FREETYPE_DIR) - $(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix - touch $(FREETYPE_DIR)/.unpacked - -# freetype for the target -$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked - (cd $(FREETYPE_DIR); rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/usr/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ - ) - touch $(FREETYPE_DIR)/.configured - -$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured - $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR) - touch $(FREETYPE_DIR)/.compiled - -$(STAGING_DIR)/usr/include/freetype: - ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype - -#$(STAGING_DIR)/include/freetype: -# mkdir -p $(STAGING_DIR)/include -# ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype - -$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ - $(STAGING_DIR)/usr/bin/freetype-config - touch -c $(STAGING_DIR)/lib/libfreetype.so - -$(TARGET_DIR)/lib/libfreetype.so: $(STAGING_DIR)/lib/libfreetype.so - cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/ - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libfreetype.so - -# freetype for the host, needed for build-tools of fontconfig - -# great, it can't be built out of tree reliably -$(FREETYPE_DIR1)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) - $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - - touch $(FREETYPE_DIR1)/.unpacked - -$(FREETYPE_DIR1)/.configured: $(FREETYPE_DIR1)/.unpacked - (cd $(FREETYPE_DIR1); \ - ./configure \ - CC="$(HOSTCC)" \ - --prefix="$(FREETYPE_HOST_DIR)" \ - ) - touch $(FREETYPE_DIR1)/.configured - -$(FREETYPE_DIR1)/.compiled: $(FREETYPE_DIR1)/.configured - $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR1) - touch $(FREETYPE_DIR1)/.compiled - -$(FREETYPE_HOST_DIR)/lib/libfreetype.so: $(FREETYPE_DIR1)/.configured - $(MAKE) -C $(FREETYPE_DIR1) install - touch -c $@ - -.PHONY: freetype freetype-source freetype-links freetype-clean freetype-dirclean - -freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so freetype-links - -freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE) - -freetype-links: $(STAGING_DIR)/usr/include/freetype # $(STAGING_DIR)/include/freetype - -freetype-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall - -$(MAKE) -C $(FREETYPE_DIR) clean - -freetype-dirclean: - rm -rf $(FREETYPE_DIR) - -.PHONY: host-freetype - -host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_FREETYPE)),y) -TARGETS+=freetype -endif +FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION))) +FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 +FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype +FREETYPE_AUTORECONF = NO +FREETYPE_INSTALL_STAGING = YES +FREETYPE_INSTALL_TARGET = YES +FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install + +FREETYPE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_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 + +FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)" +FREETYPE_DEPENDENCIES = uclibc pkgconfig + +$(eval $(call AUTOTARGETS,package,freetype)) \ No newline at end of file -- 2.30.2