update to zbar-0.23.90, ok jsg@
This commit is contained in:
sthen
parent
0bd996c76c
commit
9cfd2dbc08
|
|
@ -1,10 +1,10 @@
|
|||
# $OpenBSD: Makefile,v 1.30 2021/02/23 19:39:27 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2021/11/01 14:47:42 sthen Exp $
|
||||
|
||||
COMMENT= ZBar barcode reader
|
||||
|
||||
GH_ACCOUNT= mchehab
|
||||
GH_PROJECT= zbar
|
||||
GH_TAGNAME= 0.23.1
|
||||
GH_TAGNAME= 0.23.90
|
||||
|
||||
SHARED_LIBS= zbar 0.1 \
|
||||
zbargtk 0.1
|
||||
|
|
@ -22,15 +22,16 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.org>
|
|||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ICE MagickCore-6.Q16 MagickWand-6.Q16
|
||||
WANTLIB += SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
|
||||
WANTLIB += Xrandr Xrender Xt Xv atk-1.0 atk-bridge-2.0 bz2 c cairo
|
||||
WANTLIB += cairo-gobject djvulibre epoxy expat ffi fftw3
|
||||
WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
|
||||
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gtk-3 harfbuzz
|
||||
WANTLIB += iconv intl jasper jbig jpeg lcms2 lzma m openjp2 pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png raw_r
|
||||
WANTLIB += tiff webp webpdemux webpmux xcb xcb-render xcb-shm
|
||||
WANTLIB += xml2 z zstd
|
||||
WANTLIB += SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender Xt Xv aom atk-1.0 atk-bridge-2.0
|
||||
WANTLIB += bz2 c cairo cairo-gobject dav1d de265 djvulibre epoxy
|
||||
WANTLIB += execinfo expat ffi fontconfig freetype fribidi gdk-3
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
|
||||
WANTLIB += graphite2 gtk-3 harfbuzz heif iconv intl jasper jbig
|
||||
WANTLIB += jpeg lcms2 lzma m openjp2 pango-1.0 pangocairo-1.0
|
||||
WANTLIB += pangoft2-1.0 pcre pixman-1 png raw_r tiff util webp
|
||||
WANTLIB += webpdemux webpmux x265 xcb xcb-render xcb-shm xml2
|
||||
WANTLIB += z zstd
|
||||
|
||||
MODULES= lang/python
|
||||
|
||||
|
|
@ -46,5 +47,15 @@ CONFIGURE_ARGS+= --with-gtk=gtk3 \
|
|||
--without-qt \
|
||||
--without-dbus
|
||||
USE_GMAKE= Yes
|
||||
# upstream ships pregenerated manuals, but doesn't install them unless
|
||||
# xmlto is detected. this avoids having to depend on xmlto at build time.
|
||||
CONFIGURE_ENV= XMLTO=true
|
||||
|
||||
TEST_DEPENDS= devel/argp-standalone \
|
||||
sysutils/coreutils
|
||||
TEST_FLAGS= LIBS="-largp -lpthread"
|
||||
|
||||
pre-test:
|
||||
ln -fs ${LOCALBASE}/bin/gsha1sum ${WRKDIR}/bin/sha1sum
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (zbar-0.23.1.tar.bz2) = 2tJgtH74h6Y56EConl5uEyIXtruiqEc1ZdH0Wby5fB8=
|
||||
SIZE (zbar-0.23.1.tar.bz2) = 1195599
|
||||
SHA256 (zbar-0.23.90.tar.bz2) = kVLI+zArOJHhy5zHGYg9L0zNJIPjQweDos8tk71ZAa0=
|
||||
SIZE (zbar-0.23.90.tar.bz2) = 1199323
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$OpenBSD: patch-Makefile_in,v 1.1 2020/11/03 23:18:10 jca Exp $
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2021/11/01 14:47:43 sthen Exp $
|
||||
|
||||
Missing dep on gettext/libintl
|
||||
|
||||
Index: Makefile.in
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -884,7 +884,7 @@ SUBDIRS = zbar $(am__append_3) $(am__append_21) $(am__
|
||||
@@ -885,7 +885,7 @@ SUBDIRS = zbar $(am__append_3) $(am__append_21) $(am__
|
||||
@HAVE_MAGICK_TRUE@ $(am__append_7)
|
||||
@HAVE_MAGICK_TRUE@zbarimg_zbarimg_CPPFLAGS = $(MAGICK_CFLAGS) $(AM_CPPFLAGS)
|
||||
@HAVE_MAGICK_TRUE@zbarimg_zbarimg_LDADD = zbar/libzbar.la \
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
$OpenBSD: patch-configure,v 1.1 2020/11/03 23:18:10 jca Exp $
|
||||
$OpenBSD: patch-configure,v 1.2 2021/11/01 14:47:43 sthen Exp $
|
||||
|
||||
Zap bash construct.
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -25064,7 +25064,7 @@ else
|
||||
@@ -25265,7 +25265,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-JAVAC=${JAVAC/ecj/ecj -1.5}
|
||||
+#JAVAC=${JAVAC/ecj/ecj -1.5}
|
||||
|
||||
# Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
|
||||
# look strictly at the $JAVA_HOME in order to avoid mixing different versions
|
||||
if test -z "$JAVAH"; then :
|
||||
for ac_prog in javah
|
||||
|
|
|
|||
11
graphics/zbar/patches/patch-test_test_examples_sh_in
Normal file
11
graphics/zbar/patches/patch-test_test_examples_sh_in
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
$OpenBSD: patch-test_test_examples_sh_in,v 1.1 2021/11/01 14:47:43 sthen Exp $
|
||||
|
||||
Index: test/test_examples.sh.in
|
||||
--- test/test_examples.sh.in.orig
|
||||
+++ test/test_examples.sh.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/bin/ksh
|
||||
|
||||
unset ERR
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
$OpenBSD: patch-zbarimg_zbarimg_c,v 1.3 2020/11/03 23:19:14 jca Exp $
|
||||
|
||||
https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a.patch
|
||||
https://github.com/mchehab/zbar/commit/505f1a87b32cb7bb0edbaf37e20ccdd46bbae2a3.patch
|
||||
|
||||
Index: zbarimg/zbarimg.c
|
||||
--- zbarimg/zbarimg.c.orig
|
||||
+++ 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
|
||||
@@ -495,7 +494,7 @@ int main (int argc, const char *argv[])
|
||||
#endif
|
||||
#endif
|
||||
fprintf(stderr, "\n");
|
||||
- if(notfound)
|
||||
+ if(notfound) {
|
||||
fprintf(stderr, "%s", _(warning_not_found_head));
|
||||
#if ENABLE_EAN == 1
|
||||
fprintf(stderr, _("\t. EAN/UPC (EAN-13, EAN-8, EAN-2, EAN-5, UPC-A, UPC-E, ISBN-10, ISBN-13)\n"));
|
||||
@@ -528,6 +527,7 @@ int main (int argc, const char *argv[])
|
||||
fprintf(stderr, _("\t. PDF 417\n"));
|
||||
#endif
|
||||
fprintf(stderr, "%s", _(warning_not_found_tail));
|
||||
+ }
|
||||
}
|
||||
if(num_images && notfound && !exit_code)
|
||||
exit_code = 4;
|
||||
Loading…
Reference in New Issue
Block a user