NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/zbar: bump to version 0.23.1

Browse Source 
- 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
  8729c4ef88)
- Update indentation in hash file (two spaces)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2020-07-28 12:19:09 +02:00 committed by Peter Korsgaard
parent 436daadc42
commit 2130694a59
3 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/zbar/0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch Normal file
View File

@ -0,0 +1,45 @@
From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
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 <mchehab+huawei@kernel.org>
[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 <fontaine.fabrice@gmail.com>
---
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 <zbar.h>
#ifdef ENABLE_NLS
-#include "../zbar/gettext.h"
# include <libintl.h>
# 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 <zbar.h>
#ifdef ENABLE_NLS
-#include "../zbar/gettext.h"
# include <libintl.h>
# define _(string) gettext(string)
#else

4
package/zbar/zbar.hash
View File

@ -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

10
package/zbar/zbar.mk
View File

@ -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 \