zbar: switch upstream and update to 0.23.1

This commit is contained in:
Leonid Pliushch 2020-11-27 14:04:23 +02:00
parent 6fa1c5f2e9
commit 218762ec96
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 5 additions and 38 deletions

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=http://zbar.sourceforge.net
TERMUX_PKG_HOMEPAGE=https://github.com/mchehab/zbar
TERMUX_PKG_DESCRIPTION="Software suite for reading bar codes from various sources"
TERMUX_PKG_LICENSE="LGPL-2.0"
TERMUX_PKG_VERSION=0.10
TERMUX_PKG_REVISION=12
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6
TERMUX_PKG_VERSION=0.23.1
TERMUX_PKG_SRCURL=https://github.com/mchehab/zbar/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=297439f8859089d2248f55ab95b2a90bba35687975365385c87364c77fdb19f3
TERMUX_PKG_DEPENDS="libiconv, imagemagick, libjpeg-turbo, zlib"
TERMUX_PKG_BREAKS="zbar-dev"
TERMUX_PKG_REPLACES="zbar-dev"
@ -14,5 +13,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread
--without-python --mandir=$TERMUX_PREFIX/share/man"
termux_step_pre_configure() {
autoconf
autoreconf -vfi
}

View File

@ -1,20 +0,0 @@
diff -u -r ../zbar-0.10/configure.ac ./configure.ac
--- ../zbar-0.10/configure.ac 2009-10-23 14:16:44.000000000 -0400
+++ ./configure.ac 2016-05-03 09:00:57.495043230 -0400
@@ -281,15 +281,7 @@
])])])
MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
AC_MSG_NOTICE([using ImageMagick version $MAGICK_VERSION])
-
-dnl double check ImageMagick install (bug #2582232)
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
- AC_CHECK_HEADER([wand/MagickWand.h], [],
- [AC_MSG_FAILURE([ImageMagick package found but wand/MagickWand.h not installed?!
-this is a problem with your ImageMagick install,
-please resolve the inconsistency and try again...])])
- CPPFLAGS="$CPPFLAGS_save"])
+ ])
AM_CONDITIONAL([HAVE_MAGICK], [test "x$with_imagemagick" = "xyes"])

View File

@ -1,12 +0,0 @@
diff -u -r ../zbar-0.10/zbarimg/zbarimg.c ./zbarimg/zbarimg.c
--- ../zbar-0.10/zbarimg/zbarimg.c 2009-10-23 14:16:44.000000000 -0400
+++ ./zbarimg/zbarimg.c 2016-05-03 08:54:42.053504890 -0400
@@ -38,7 +38,7 @@
#include <assert.h>
#include <zbar.h>
-#include <wand/MagickWand.h>
+#include <ImageMagick-7/MagickWand/MagickWand.h>
/* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
* (still not sure this check is quite right...