From patchwork Sun Jul 7 16:52:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1128696 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.b="QEKMkxZK"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45hZbc4Ftpz9s7T for ; Mon, 8 Jul 2019 03:00:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 287EA85567; Sun, 7 Jul 2019 17:00:56 +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 CAB5JC7Nc01O; Sun, 7 Jul 2019 17:00:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2604D8553C; Sun, 7 Jul 2019 17:00:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DB3311BF5DC for ; Sun, 7 Jul 2019 17:00:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D87CD85010 for ; Sun, 7 Jul 2019 17:00:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oO8LPjqQNPz0 for ; Sun, 7 Jul 2019 17:00:52 +0000 (UTC) X-Greylist: delayed 00:08:06 by SQLgrey-1.7.6 Received: from crapouillou.net (outils.crapouillou.net [89.234.176.41]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 93E64845DF for ; Sun, 7 Jul 2019 17:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1562518362; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=Nuq9ypRja6I43FV1Mo4251mBOoNWIny2Y969SDQRcpQ=; b=QEKMkxZKSEEmQ0T4abPQypke2lMpAeAPPMb4Bwr4xBrE9+WsT5MiFIpXmRTiTUXeKuDA9O LkBPAjUpMrgq6DbIYzgXP3KQ/vytbIOECp/R0Jp8aVMwpeJBaYvgoHxzGrlfQkAkbDTzj2 /4S9RSkKfNolYwvLDkUkhBFSWCTsai8= From: Paul Cercueil To: buildroot@buildroot.org Date: Sun, 7 Jul 2019 12:52:24 -0400 Message-Id: <20190707165224.31438-1-paul@crapouillou.net> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libpng: allow selection of older libpng versions 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: , Cc: Bernd Kuhls , Paul Cercueil Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" By allowing building an older version of libpng, we can create Buildroot systems that are still binary-compatible with applications compiled with older Buildroot toolchains. Signed-off-by: Paul Cercueil --- .../0001-Disable-pngfix-and-png-fix-itxt.patch | 0 package/libpng/Config.in | 15 +++++++++++++++ package/libpng/libpng.hash | 2 ++ package/libpng/libpng.mk | 11 +++++++++++ 4 files changed, 28 insertions(+) rename package/libpng/{ => 1.6.37}/0001-Disable-pngfix-and-png-fix-itxt.patch (100%) diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/1.6.37/0001-Disable-pngfix-and-png-fix-itxt.patch similarity index 100% rename from package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch rename to package/libpng/1.6.37/0001-Disable-pngfix-and-png-fix-itxt.patch diff --git a/package/libpng/Config.in b/package/libpng/Config.in index b0a3646078..099492c07c 100644 --- a/package/libpng/Config.in +++ b/package/libpng/Config.in @@ -6,3 +6,18 @@ config BR2_PACKAGE_LIBPNG images. http://www.libpng.org/ + +choice + prompt "libpng version series" + default BR2_PACKAGE_LIBPNG_16 + +config BR2_PACKAGE_LIBPNG_16 + bool "libpng 1.6" + +config BR2_PACKAGE_LIBPNG_14 + bool "libpng 1.4" + +config BR2_PACKAGE_LIBPNG_12 + bool "libpng 1.2" + +endchoice diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index e86b8c65ce..c4bfc812cb 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -2,5 +2,7 @@ md5 015e8e15db1eecde5f2eb9eb5b6e59e9 libpng-1.6.37.tar.xz sha1 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 libpng-1.6.37.tar.xz # Locally computed: +sha256 b4635f15b8adccc8ad0934eea485ef59cc4cae24d0f0300a9a941e51974ffcc7 libpng-1.2.59.tar.xz +sha256 8d419a8b2a5edddda5cbcb897ded92205344a3249fa7a00d6384ea23ac3ccbd8 libpng-1.4.22.tar.xz sha256 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-1.6.37.tar.xz sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 5c30a4f9ad..2a89595006 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,8 +4,19 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_LIBPNG_16),y) LIBPNG_VERSION = 1.6.37 LIBPNG_SERIES = 16 +else +ifeq ($(BR2_PACKAGE_LIBPNG_14),y) +LIBPNG_VERSION = 1.4.22 +LIBPNG_SERIES = 14 +else +LIBPNG_VERSION = 1.2.59 +LIBPNG_SERIES = 12 +endif +endif + LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_LICENSE = Libpng-2.0