From patchwork Fri Oct 25 11:34:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 286126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5AFCD2C0119 for ; Fri, 25 Oct 2013 22:35:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3CAD28CEC1; Fri, 25 Oct 2013 11:34:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id htvTGVnWMJcl; Fri, 25 Oct 2013 11:34:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6FFBC8CE5C; Fri, 25 Oct 2013 11:34:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5D4761BFA8F for ; Fri, 25 Oct 2013 11:34:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 57A7C8CE5C for ; Fri, 25 Oct 2013 11:34:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f4LcGTIBPIhu for ; Fri, 25 Oct 2013 11:34:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id D79438CDCB for ; Fri, 25 Oct 2013 11:34:55 +0000 (UTC) Received: from asgard (host58.190-231-106.telecom.net.ar [190.231.106.58]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r9PBYnpM028176 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 25 Oct 2013 11:34:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1382700893; bh=GKPK1Zc1KIvXVQmTOc3AbDJby8/5D2Glz/YjAFXlukk=; h=From:To:Cc:Subject:Date; b=PYznYcq23pp0kQnYzuWzdTFB637gtx+3W1o41q2v/VJnn9XR73HIteAaPOqmTsvvU OX2OMEaXxkdmKPUDvd3doBpdJMDOySdsr4vUCADvmnx7kJVP+lrQGbXH9nnM5quXSx CRsZ27p4n9LUDZbk1jTT2EfMADXAjUbZWwpDVQpU= Received: by asgard (sSMTP sendmail emulation); Fri, 25 Oct 2013 08:34:43 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 25 Oct 2013 08:34:38 -0300 Message-Id: <1382700881-28336-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.8 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 1/4] freetype: bump to version 2.5.0.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- package/freetype/freetype.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 177adf5..1ca779e 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,9 +4,11 @@ # ################################################################################ -FREETYPE_VERSION = 2.4.12 +FREETYPE_VERSION_MAJOR = 2.5.0 +FREETYPE_VERSION_MINOR = 1 +FREETYPE_VERSION = $(FREETYPE_VERSION_MAJOR).$(FREETYPE_VERSION_MINOR) FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 -FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION) +FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION_MAJOR) FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPLv2+ @@ -18,6 +20,14 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_LIBPNG),y) +FREETYPE_DEPENDENCIES += libpng +FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \ + LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`" +else +FREETYPE_CONF_OPT += --without-png +endif + # Extra fixing since includedir and libdir are expanded from configure values define FREETYPE_FIX_CONFIG_FILE $(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \