From patchwork Wed May 8 10:32:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Serafini X-Patchwork-Id: 1096881 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=sensefly.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=parrotgroup.onmicrosoft.com header.i=@parrotgroup.onmicrosoft.com header.b="Kl4dlpbK"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44zXq62X0sz9s9T for ; Wed, 8 May 2019 20:32:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BB2D862FC; Wed, 8 May 2019 10:32:30 +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 55xIgyPbNaqi; Wed, 8 May 2019 10:32:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B7926860CF; Wed, 8 May 2019 10:32:29 +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 86E371BF2AE for ; Wed, 8 May 2019 10:32:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 82A3A207A2 for ; Wed, 8 May 2019 10:32:26 +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 ye31PW5js2B6 for ; Wed, 8 May 2019 10:32:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40087.outbound.protection.outlook.com [40.107.4.87]) by silver.osuosl.org (Postfix) with ESMTPS id B707320791 for ; Wed, 8 May 2019 10:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=parrotgroup.onmicrosoft.com; s=selector1-sensefly-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DtQVTHH6BMm4EKwAryeS+N9stiNjN476l7nBylK0PwA=; b=Kl4dlpbKkPsreseNl711MTgHO1DeVubd+f0p0quhH/+4yFynR5BMfWyXNbpX4xADTJ90I3LFNgnN+Ej4oESC/WnczA86FJaskw172TqTVPfQGgzdhyF0kZOlLw15g9SXTN8K3B3nIqVXAE9Zxah9yRDIpRq+n1b+cz97k0NfIZw= Received: from AM0PR10MB2020.EURPRD10.PROD.OUTLOOK.COM (52.134.81.157) by AM0PR10MB2163.EURPRD10.PROD.OUTLOOK.COM (20.177.109.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1856.12; Wed, 8 May 2019 10:32:21 +0000 Received: from AM0PR10MB2020.EURPRD10.PROD.OUTLOOK.COM ([fe80::9035:54fb:5783:860a]) by AM0PR10MB2020.EURPRD10.PROD.OUTLOOK.COM ([fe80::9035:54fb:5783:860a%6]) with mapi id 15.20.1856.012; Wed, 8 May 2019 10:32:21 +0000 From: Nicolas Serafini To: "buildroot@buildroot.org" Thread-Topic: [PATCH v2] package/exiv2: cleanup options and licenses Thread-Index: AQHVBYlR6tgZcuJ0pEW8YA+c3eVawg== Date: Wed, 8 May 2019 10:32:21 +0000 Message-ID: <20190508103129.100751-1-nicolas.serafini@sensefly.com> Accept-Language: fr-CH, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PR0P264CA0015.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100::27) To AM0PR10MB2020.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:44::29) authentication-results: spf=none (sender IP is ) smtp.mailfrom=nicolas.serafini@sensefly.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.21.0 x-originating-ip: [194.209.160.178] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 994f1b57-d62b-4da3-b640-08d6d3a073df x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328)(7193020); SRVR:AM0PR10MB2163; x-ms-traffictypediagnostic: AM0PR10MB2163: x-ms-exchange-purlcount: 3 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 0031A0FFAF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39850400004)(366004)(346002)(396003)(136003)(376002)(189003)(199004)(71200400001)(2501003)(71190400001)(54906003)(6116002)(5660300002)(102836004)(66066001)(4326008)(25786009)(6506007)(2906002)(386003)(1076003)(53936002)(6916009)(8936002)(8676002)(81156014)(50226002)(81166006)(1730700003)(107886003)(3846002)(99286004)(305945005)(7736002)(68736007)(6486002)(36756003)(2351001)(6306002)(6512007)(316002)(86362001)(52116002)(26005)(186003)(66476007)(44832011)(486006)(478600001)(476003)(14454004)(966005)(2616005)(6436002)(66946007)(73956011)(5640700003)(66556008)(66446008)(64756008)(14444005)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR10MB2163; H:AM0PR10MB2020.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: sensefly.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: tKou3+ejkwfXgZVWowsOB7FLTnYtOxG8Hx3iAmH9kn4Guy+WJKWLwgWX0c2h0Q0jDjHYb4MgVajCjwV3im5poVqhVWbh92o/2mRMZVaThlCWizbFlXizyEwTTg0iVKrTGzFJ4tOTxjSxVEdT8OXwngSLMtBCdg/FzGVWsUe3dNL1mcvkwnMZ10+AcX9b7V1hsl/zjiHgfAEqhoupHFG7MZRagjtQTkntDp/V7mDToew97Zih1KtQAVjInDcJRwXAOxz0uLgLXkPq1wDqUWgkflDc/t6MWg24S9fD11ezUfcmRE99ODG/H5/PEtQqXqFBBrMhRx8SGWyRxpf4xbxYBFk8WUNLvzbHky4w6I+VqWaC/gm/Fp17bP7r81h+XWDgBNtIA7hLHCvrxLRfUGPofn8mgNLiZp2ZElMgPejZLns= MIME-Version: 1.0 X-OriginatorOrg: sensefly.com X-MS-Exchange-CrossTenant-Network-Message-Id: 994f1b57-d62b-4da3-b640-08d6d3a073df X-MS-Exchange-CrossTenant-originalarrivaltime: 08 May 2019 10:32:21.5101 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: ff7d991b-3922-4803-8418-ab806a3414a6 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2163 Subject: [Buildroot] [PATCH v2] package/exiv2: cleanup options and licenses 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" exiv2 no longer requires a commercial option for lens database integration since version 0.27. Legacy handling for the removed options _COMMERCIAL and _LENSDATA is not needed, since now they are always enabled. Add the dedicated BSD-3-Clause license file for CMakeLists.txt, config/FindEXPAT.cmake and config/FindMSGFMT.cmake files. Signed-off-by: Nicolas Serafini --- Changes v1 -> v2: - remove _LENSDATA option (suggested by Arnout Vandecappelle) - remove commercial license in Config.in help - add missing BSD-3-Clause flag - Add details to the patch message --- package/exiv2/Config.in | 23 ----------------------- package/exiv2/exiv2.hash | 1 + package/exiv2/exiv2.mk | 17 +++-------------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in index acce81c593..72c2a88040 100644 --- a/package/exiv2/Config.in +++ b/package/exiv2/Config.in @@ -16,24 +16,10 @@ config BR2_PACKAGE_EXIV2 access to the Exif, IPTC and XMP metadata of images in various formats. - Exiv2 is available under the GPLv2+ or under a commercial - license. - http://www.exiv2.org/ if BR2_PACKAGE_EXIV2 -config BR2_PACKAGE_EXIV2_COMMERCIAL - bool "Enable commercial" - help - Build the commercial version for closed source project. - - The Nikon lens name database and the NLS support is disabled - for copyright reasons. - - A commercial license request is needed. - http://www.exiv2.org/download.html#license - config BR2_PACKAGE_EXIV2_PNG bool "PNG image support" select BR2_PACKAGE_ZLIB @@ -46,13 +32,4 @@ config BR2_PACKAGE_EXIV2_XMP help Build with XMP support -config BR2_PACKAGE_EXIV2_LENSDATA - bool "Nikon lens name database" - depends on !BR2_PACKAGE_EXIV2_COMMERCIAL - help - Integrate Nikon lens name database. - - This database is integrated but comes from a thirdparty: - http://www.rottmerhusen.com/objektives/lensid/thirdparty.html. - endif diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index f99cb8cb87..b753c03854 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 1b3766b2c203ce213a4195de14d61694017ec1a69d15d4575bccecef130990fe exiv2-0.27.1.tar.gz sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING +sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index ba9d9b7303..c557c08fb8 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -7,27 +7,16 @@ EXIV2_VERSION = 0.27.1 EXIV2_SITE = $(call github,Exiv2,exiv2,$(EXIV2_VERSION)) EXIV2_INSTALL_STAGING = YES +EXIV2_LICENSE = GPL-2.0+ BSD-3-Clause +EXIV2_LICENSE_FILES = COPYING COPYING-CMAKE-SCRIPTS EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=ON # The following CMake variable disables a TRY_RUN call in the -pthread # test which is not allowed when cross-compiling. EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF -ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),) -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF -endif - -ifeq ($(BR2_PACKAGE_EXIV2_COMMERCIAL),y) -EXIV2_LICENSE = commercial -# NLS support is disabled in commercial version due to the copyright -# of the translated texts. -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF -else -EXIV2_LICENSE = GPL-2.0+ -EXIV2_LICENSE_FILES = COPYING -endif - ifeq ($(BR2_PACKAGE_EXIV2_PNG),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=ON EXIV2_DEPENDENCIES += zlib