From patchwork Tue Jul 28 10:19:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1337736 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.138; helo=whitealder.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=bhft86ak; 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 4BGCMs3VbSz9sSt for ; Tue, 28 Jul 2020 20:19:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BC54F865CF; Tue, 28 Jul 2020 10:19:34 +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 0VsDUtJcUdYs; Tue, 28 Jul 2020 10:19:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 62CA3865C1; Tue, 28 Jul 2020 10:19:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3ED851BF396 for ; Tue, 28 Jul 2020 10:19:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DE59687EA9 for ; Tue, 28 Jul 2020 10:19:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3fkRSPZIc+rq for ; Tue, 28 Jul 2020 10:19:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by hemlock.osuosl.org (Postfix) with ESMTPS id E84CB87E94 for ; Tue, 28 Jul 2020 10:19:21 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id a5so7754138wrm.6 for ; Tue, 28 Jul 2020 03:19:21 -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=zgFWiGOxeXyp3G8/z/JfHL4FVWWbsxETlfD8vAUmUqQ=; b=bhft86akLnK+g4l4d3j4hULif1nfeuc07GKXNX4z7gi5n3cTvGsHhQPzEbjRzzG7OL hj3WjZb+fMp8Or50l+guOd3K0LXvThrQasjR+HpvEI+Dgte1AuXQ+e83UTGWR2s8xMg2 YibvedrXFoNRiLZtWRUxh0Lp6JFAS8LCzVLFkgQYW+vHihhHKPkqPWYTjk+Zt3YPom22 i4MxJPXxpYBOPbs7LLU0xMT/TW9I4eroQSladuffJh6IWM8iLUG+Tb9ZXiupU22bmGg5 Ve7FD6ggOIb1SQOQUMmYKTk4vVTz3rSuMoiUH6XjZUni03kl2wdl50bt/DuOYxEa21Kq mmVw== 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=zgFWiGOxeXyp3G8/z/JfHL4FVWWbsxETlfD8vAUmUqQ=; b=CJ/e7NHHtzrRmf9tVcn79nWeNxmwTO6wmgQB6CA8AfGnaCIIU9HuQ7Oty8r/X7USGW QIa8pMtrESC7Cx+WVUBssxrAKDHYlJLoihZEGrNwKLYOeojpD+ZCZVRP7kVk+PBRLt4/ t9fQKrrTkBvqtLyS/h+n+7AOeVP8Rl8nDZ7z1jgu3bPBIM8ngPi8vCtaPKMNDIZljvZM QWdGGBSQPGMKjTNIv3SrMsJv2xCw8nVWsWRPPI44PhlnGzDSPe9eW0Ceg6r6Soqj8bB2 r5+HRgrAMWyaPnlZMuoyfVf5poBpJfu97NzCMI6IDeBnoqS2DKuzHHH/Kf3lI2tVYTPf QbnQ== X-Gm-Message-State: AOAM533afoaEmJ/IPFcbDoH15OI0VGKEnJwEaXvYqZZcHZnfFjN6v6lu nIFxSKIcz3fOQ/RF3WjerBdlf+BU X-Google-Smtp-Source: ABdhPJzWehfuaYy59qx5Z70cxx9a3RDWIbyxmkQ6H1czw3yMthVBFNO5E5fiixSCZL4AHO/PshT75Q== X-Received: by 2002:adf:de08:: with SMTP id b8mr22986952wrm.4.1595931559834; Tue, 28 Jul 2020 03:19:19 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id o4sm3099713wmc.13.2020.07.28.03.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 03:19:18 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 28 Jul 2020 12:19:09 +0200 Message-Id: <20200728101909.2723100-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4,1/1] package/zbar: bump to version 0.23.1 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: Fabrice Fontaine , Volkov Viacheslav Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Add new NLS dependency as well as a patch to fix a build failure without it - Drop host-gettext (not needed since autoreconf was dropped with 8729c4ef881b02ff85b7645b0ad309d6ae44fccf) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- Changes v3 -> v4 (after review of Yann E. Morin): - Report license issue about gettext.h and retrieve upstream patch: https://github.com/mchehab/zbar/issues/98 Changes v2 -> v3 (after review of Thomas Petazzoni): - Drop host-gettext dependency Changes v1 -> v2: - Correctly pass TARGET_NLS_LIBS to ZBAR_CONF_ENV ...zbarcam-zbarimg-get-rid-of-gettext-h.patch | 45 +++++++++++++++++++ package/zbar/zbar.hash | 4 +- package/zbar/zbar.mk | 10 ++--- 3 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch diff --git a/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch b/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch new file mode 100644 index 0000000000..009fd5f96f --- /dev/null +++ b/package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch @@ -0,0 +1,45 @@ +From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Tue, 28 Jul 2020 09:47:03 +0200 +Subject: [PATCH] zbarcam, zbarimg: get rid of gettext.h + +This doesn't seem to be needed at all for translations to +work. Also, gettext.h uses a different license. So, let's get +rid of it. + +Signed-off-by: Mauro Carvalho Chehab +[Retrieved (and updated to remove gettext.h which is not in the +tarball): +https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a] +Signed-off-by: Fabrice Fontaine +--- + zbar/gettext.h | 294 ---------------------------------------------- + zbarcam/zbarcam.c | 1 - + zbarimg/zbarimg.c | 1 - + 3 files changed, 296 deletions(-) + delete mode 100644 zbar/gettext.h + +diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c +index f7ea281..ad30101 100644 +--- a/zbarcam/zbarcam.c ++++ b/zbarcam/zbarcam.c +@@ -35,7 +35,6 @@ + #include + + #ifdef ENABLE_NLS +-#include "../zbar/gettext.h" + # include + # define _(string) gettext(string) + #else +diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c +index 0796fd8..d05d832 100644 +--- a/zbarimg/zbarimg.c ++++ b/zbarimg/zbarimg.c +@@ -40,7 +40,6 @@ + #include + + #ifdef ENABLE_NLS +-#include "../zbar/gettext.h" + # include + # define _(string) gettext(string) + #else diff --git a/package/zbar/zbar.hash b/package/zbar/zbar.hash index eae5b7ebf5..4277091892 100644 --- a/package/zbar/zbar.hash +++ b/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e99fb8f3be85a76fe24784ad67fecb2da3a02b1e432696b05eefe212d448ad2e zbar-0.23.tar.bz2 -sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md +sha256 dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f zbar-0.23.1.tar.bz2 +sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 0550f3e23f..f75741ded9 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -4,17 +4,17 @@ # ################################################################################ -ZBAR_VERSION = 0.23 +ZBAR_VERSION = 0.23.1 ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md ZBAR_INSTALL_STAGING = YES -ZBAR_DEPENDENCIES = libv4l jpeg -# add host-gettext for AM_ICONV macro -ZBAR_DEPENDENCIES += host-gettext +ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features -ZBAR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ZBAR_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ + LIBS=$(TARGET_NLS_LIBS) ZBAR_CONF_OPTS = \ --disable-doc \ --without-imagemagick \