From patchwork Mon Apr 25 21:44:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 614709 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]) by ozlabs.org (Postfix) with ESMTP id 3qv0BL2zCWz9t6t for ; Tue, 26 Apr 2016 07:44:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=vAkMGBuI; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8179C8A3AE; Mon, 25 Apr 2016 21:44: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 FPoCvk-G6T9q; Mon, 25 Apr 2016 21:44:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 62F628A277; Mon, 25 Apr 2016 21:44:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7D0461C11AF for ; Mon, 25 Apr 2016 21:44:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 74BEE2E5CF for ; Mon, 25 Apr 2016 21:44:50 +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 1VofXpfnmPnq for ; Mon, 25 Apr 2016 21:44:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by silver.osuosl.org (Postfix) with ESMTPS id 7A1772E2AE for ; Mon, 25 Apr 2016 21:44:49 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id n3so149783696wmn.0 for ; Mon, 25 Apr 2016 14:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ur9hSv/Ne68wshZp5+9652Ei9x1e2UDDvgpAbiN2HV4=; b=vAkMGBuICM8c37D8EXS4BzfiL7c+4l7wzLh+dxrMTMgSloyKaBFVBbr0j76SjqA5Wg bZ0NM6WC69qMTrvnWAhSAyjxOozk/1ka1Lx5kogdgtoqv5J6etBUY0CE4Rw5AA9nV/C0 ScucWVbWBBffVZHQBAYyh1JsQ7hrXsG/zyZpqTjBUWOF9DCgkBGntiN17mI+Md1xKcD0 E90V/XbMR84uvkIyG6rEdAxf7HbCk74sG+jAu+QMPaMgNOf/zD4JNuJywCk8weKNe8uR DOszzGCA1MS8xe44szvlgcdWtx25SRYhpp6yn0EMVlkcyO178fj7u7aCHzz6IXGxQMMI g6Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ur9hSv/Ne68wshZp5+9652Ei9x1e2UDDvgpAbiN2HV4=; b=W5qFGrDSFs8vt2XejTyhAq+woBN7l2s2JlqO864vNSLsonCjpmtwlbtDRgr8xIEnXy meuUXXUvOlE0IjPw62uTyperuT2Bui6X+l+1u2A91m7Ul7QeqijY+Do1mp8MDZHUG2Up rSDJCpH85TMP4V5d9oULsUc2H3iFnGIZ66qMVVNFqah5aJO6kamCuBUY63sRuHpanzrS X5r5RiKmxHo57wn2Zr8Ew+S7UqJk+iVX958MnCoeYcoN6yV9frnKeCCzM4UxF1Bm7xSI ugjKMa6iP5cnZgurhk9L36+r+IcyWg5mBxlZ8WypKo+S6+ytN9gZEaj8XLG1SVB+m2TR p1vg== X-Gm-Message-State: AOPr4FV5keuoZnI7fqQ9xZ+8Q7wy4mQyVwF7sMK+8dKq4O/Qez9yqI2WLmtArRo+O0KXjg== X-Received: by 10.28.141.18 with SMTP id p18mr14021632wmd.57.1461620687842; Mon, 25 Apr 2016 14:44:47 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id da5sm25575261wjb.25.2016.04.25.14.44.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 14:44:46 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Mon, 25 Apr 2016 23:44:31 +0200 Message-Id: <1461620673-31313-2-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461620673-31313-1-git-send-email-angelo.compagnucci@gmail.com> References: <1461620673-31313-1-git-send-email-angelo.compagnucci@gmail.com> Subject: [Buildroot] [PATCH v2 1/3] package/openjpeg: bump to version 2.1 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" This patch: * bumps openjpeg to version 2.1 * changes download location to github * converts the package to use cmake Signed-off-by: Angelo Compagnucci --- package/openjpeg/openjpeg.hash | 2 +- package/openjpeg/openjpeg.mk | 34 +++++++--------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index a8695c1..35d4fbd 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 openjpeg-1.5.2.tar.gz +sha256 4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc openjpeg-2.1.tar.gz diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index c613ba8..bf12526 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,35 +4,15 @@ # ################################################################################ -OPENJPEG_VERSION = 1.5.2 -OPENJPEG_SITE = http://downloads.sourceforge.net/project/openjpeg.mirror/$(OPENJPEG_VERSION) +OPENJPEG_VERSION = 2.1 +OPENJPEG_SITE = $(call github,uclouvain,openjpeg,version.$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2c OPENJPEG_LICENSE_FILES = LICENSE -# tarball does not contain the generated files -OPENJPEG_AUTORECONF = YES OPENJPEG_INSTALL_STAGING = YES -OPENJPEG_DEPENDENCIES = host-pkgconf -OPENJPEG_CONF_OPTS = --disable-lcms1 -ifeq ($(BR2_PACKAGE_LIBPNG),y) -OPENJPEG_DEPENDENCIES += libpng -OPENJPEG_CONF_OPTS += --enable-png -else -OPENJPEG_CONF_OPTS += --disable-png -endif +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2) -ifeq ($(BR2_PACKAGE_TIFF),y) -OPENJPEG_DEPENDENCIES += tiff -OPENJPEG_CONF_OPTS += --enable-tiff -else -OPENJPEG_CONF_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -OPENJPEG_DEPENDENCIES += lcms2 -OPENJPEG_CONF_OPTS += --enable-lcms2 -else -OPENJPEG_CONF_OPTS += --disable-lcms2 -endif - -$(eval $(autotools-package)) +$(eval $(cmake-package))