From patchwork Tue Sep 8 05:23:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1359443 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=WBPMl963; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bltqf3DGnz9sTK for ; Tue, 8 Sep 2020 15:24:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B15C4203D1; Tue, 8 Sep 2020 05:24:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 98kXH+p5sta6; Tue, 8 Sep 2020 05:24:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F111020535; Tue, 8 Sep 2020 05:24:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 139F41BF2F6 for ; Tue, 8 Sep 2020 05:24:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 107B5866AB for ; Tue, 8 Sep 2020 05:24:08 +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 OIcXJknW2uda for ; Tue, 8 Sep 2020 05:24:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1EA7786658 for ; Tue, 8 Sep 2020 05:24:07 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id g4so17677424wrs.5 for ; Mon, 07 Sep 2020 22:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aEEgipYd7FdHSzH0PaObzZ98oRTH11fjvDafFMuGXnI=; b=WBPMl963NYlMPnPuzoY97YZCI6VffYswFLMiZTfSbJvr8zmcyoaxX1AWTzjGYOMV+o JhSSpyyuJI+m+6IeUYXvAW75DPXUCIQPThyAKcMB57LS9skKUQ/KKvkWeU+GZQ+Ojovf TxPoLl3aLFR6qEANqkbL45HVNIpX2yaqfO0T87tvLNPAesuGxVVLLIwqleolI42dNflT h74A6BY3Kizkn+9i0FaKgcEyJdzkQrTW/WrT5fBPBoUk/yik7/qV0UBzYlGYrGkZ8R/H XLldxavtc1UvBwhNHTHHZgm9Dg5zGEg6LdNONCn44sTA7rj6/ZCB9NV4grUger9VUgLI EQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aEEgipYd7FdHSzH0PaObzZ98oRTH11fjvDafFMuGXnI=; b=D9ab4wdo/eYIO3LgNuIIW9KYfAZS6oTAvveVSPEF9WBiN8/cfftFQNLWIwZ3WMAeN6 oH9KNmRDYVZex/3KoXaurgFcWOPv9P/gh7rbvIUqsZJk7XGL9K+3/OO/xKFTXw2sUuX0 au2v2WWO07ytEi50/zAUsxdegJiDSPFJWmCwJPa0cfXlyataV0TT/TR2us+t9DYLa9Ml LqrHfhGby/qLnR1mNy/eCjIN/NTD+lzF6BkRi82RQRBuVms/cETNDbayeYsGSTS8V//f Gb36LneOMd4bexzmVZ0tqsFtAClA/Hgrvag9ZLiakgki6NFyV++tSI2rj5/xchuxjPfY 3EdQ== X-Gm-Message-State: AOAM530M90syDnpF9JqbQCjfnUMBCiQKkTuP7g+13e7I0EBOrxvdbJ7I Kc6vJ0CEhxLIqpGuDbtvt4wPJq8kNEY= X-Google-Smtp-Source: ABdhPJzmfBzQFgF0NTzw8WKgRc5H6Y20OpD+qLNhNT3KL7XgtUQVKunBDLVbvI3HNreDh+TBN2stfA== X-Received: by 2002:adf:f042:: with SMTP id t2mr23877191wro.385.1599542645267; Mon, 07 Sep 2020 22:24:05 -0700 (PDT) Received: from vm-xubuntu20.04 (245.243.119.78.rev.sfr.net. [78.119.243.245]) by smtp.gmail.com with ESMTPSA id y5sm22003484wrh.6.2020.09.07.22.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 22:24:04 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 8 Sep 2020 07:23:52 +0200 Message-Id: <20200908052352.1735787-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] lua-gd: bump to version 2ce8e478a8591afd71e607506bc8c64b161bbd30 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" drop gdlib-config Signed-off-by: Francois Perrad --- package/lua-gd/lua-gd.hash | 2 +- package/lua-gd/lua-gd.mk | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/package/lua-gd/lua-gd.hash b/package/lua-gd/lua-gd.hash index d1bab37bc..512573b47 100644 --- a/package/lua-gd/lua-gd.hash +++ b/package/lua-gd/lua-gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 114f273a64da6ccbf6e0555757b952f84ab8c134416dd7aae1aeb666ca0e964d lua-gd-e60b13b7977bb3424d7044976ccba5d42c256934.tar.gz +sha256 928fa036b37595d773db1999c9ff43195c4290f0722298fa5b0c3e619c678525 lua-gd-2ce8e478a8591afd71e607506bc8c64b161bbd30.tar.gz sha256 b0ca41d88ddb0ca785436d37b08b8f413055755eb6bfd3ea0a6ff3214303aa43 COPYING diff --git a/package/lua-gd/lua-gd.mk b/package/lua-gd/lua-gd.mk index e9a51a167..099df31f7 100644 --- a/package/lua-gd/lua-gd.mk +++ b/package/lua-gd/lua-gd.mk @@ -4,17 +4,37 @@ # ################################################################################ -LUA_GD_VERSION = e60b13b7977bb3424d7044976ccba5d42c256934 +LUA_GD_VERSION = 2ce8e478a8591afd71e607506bc8c64b161bbd30 LUA_GD_SITE = $(call github,ittner,lua-gd,$(LUA_GD_VERSION)) LUA_GD_LICENSE = MIT LUA_GD_LICENSE_FILES = COPYING LUA_GD_DEPENDENCIES = luainterpreter gd +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +LUA_GD_FEATURES += -DGD_FONTCONFIG +endif + +ifeq ($(BR2_PACKAGE_FREETYPE),y) +LUA_GD_FEATURES += -DGD_FREETYPE +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LUA_GD_FEATURES += -DGD_JPEG +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LUA_GD_FEATURES += -DGD_PNG +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) +LUA_GD_FEATURES += -DGD_XPM +endif + # VERSION follows the scheme described on https://ittner.github.io/lua-gd/manual.html#intro, # the current version of the binding is 3. define LUA_GD_BUILD_CMDS $(MAKE) -C $(@D) gd.so \ - GDLIBCONFIG="$(STAGING_DIR)/usr/bin/gdlib-config" \ + GDFEATURES="$(LUA_GD_FEATURES)" \ CC=$(TARGET_CC) \ CFLAGS="$(TARGET_CFLAGS) -fPIC -DVERSION=\\\"$(GD_VERSION)r3\\\"" \ LFLAGS="-shared -lgd"