From patchwork Thu Jan 12 20:47:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 714654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tzyWg4btzz9t2g for ; Fri, 13 Jan 2017 07:47:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B46B386DA6; Thu, 12 Jan 2017 20:47: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 jry+IXPml1U5; Thu, 12 Jan 2017 20:47:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C11686C23; Thu, 12 Jan 2017 20:47:56 +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 C7F461C01A0 for ; Thu, 12 Jan 2017 20:47:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA0EB86BF7 for ; Thu, 12 Jan 2017 20:47:55 +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 gkxcD0BL1W+a for ; Thu, 12 Jan 2017 20:47:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id D034A86C23 for ; Thu, 12 Jan 2017 20:47:53 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 26468440B5F; Thu, 12 Jan 2017 22:47:33 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 12 Jan 2017 22:47:44 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] jasper: bump to version 2.0.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Use upstream provided tarball. Upstream switched to cmake. libjpeg dependency is now optional. Signed-off-by: Baruch Siach --- package/jasper/Config.in | 1 - package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 20 +++++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package/jasper/Config.in b/package/jasper/Config.in index 087b520f11ce..72969365701d 100644 --- a/package/jasper/Config.in +++ b/package/jasper/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_JASPER bool "jasper" - select BR2_PACKAGE_JPEG help JPEG-2000 decoder diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 64ddfa4841a9..6c3ab473cf91 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0099084dce9fa0a318b48a5ed2a12ac7cff3324f3fd4459833e6fe2ff583fb2c jasper-version-1.900.31.tar.gz +sha256 54d85428e35263642358a11c312d61cbc054170546fae780e11271df5d1502e8 jasper-2.0.10.tar.gz diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 32aa61829292..f4db8c492064 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,16 +4,22 @@ # ################################################################################ -JASPER_VERSION = version-1.900.31 -JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION)) +JASPER_VERSION = 2.0.10 +JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software JASPER_INSTALL_STAGING = YES -JASPER_DEPENDENCIES = jpeg JASPER_LICENSE = JasPer License Version 2.0 JASPER_LICENSE_FILES = LICENSE +JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -# No configure script included. We need to generate it. -JASPER_AUTORECONF = YES +ifeq ($(BR2_STATIC_LIBS),y) +JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF +endif -JASPER_CONF_OPTS = --disable-strict +ifeq ($(BR2_PACKAGE_JPEG),y) +JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=ON +JASPER_DEPENDENCIES += jpeg +else +JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=OFF +endif -$(eval $(autotools-package)) +$(eval $(cmake-package))