Attachment #222708 for bug #253743




# $FreeBSD: head/graphics/zbar/Makefile 566155 2021-02-20 12:11:15Z tcberner $

PORTNAME=	zbar
DISTVERSION=	0.23.90
PORTREVISION=	20
CATEGORIES=	graphics
MASTER_SITES=	https://linuxtv.org/downloads/zbar/

MAINTAINER=	dev2@heesakkers.info
COMMENT=	ZBar barcode reader

LICENSE=	LGPL21

USES=		autoreconf gmake iconv libtool localbase:ldflags pathfix pkgconfig
USE_LDCONFIG=	yes

GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
CONFIGURE_ARGS=	--without-java --without-npapi --without-python \
		--enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417

OPTIONS_DEFINE=			DBUS DOCS GIR JPEG NLS QT5 V4L X11
OPTIONS_DEFAULT=		GTK_NONE IMAGEMAGICK JPEG NLS X11
OPTIONS_RADIO=			MAGICK
OPTIONS_RADIO_MAGICK=		GRAPHICSMAGICK IMAGEMAGICK
OPTIONS_SINGLE=			GTK
OPTIONS_SINGLE_GTK=		GTK2 GTK3 GTK_NONE
OPTIONS_SUB=			yes

GIR_DESC=			Build Gobject Introspection
GTK_DESC=			GTK support
GTK_NONE_DESC=			Build without GTK support
GRAPHICSMAGICK_DESC=		GraphicsMagick image processing support
MAGICK_DESC=			*Magick image processing support
V4L_DESC=			Build zbarcam video scanner

DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH=		dbus
IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no

DOCS_CONFIGURE_ENABLE=		doc
CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes

GIR_USES=			gnome
GIR_USE=			GNOME=introspection:build
GIR_CONFIGURE_WITH=		gir

GTK2_USES=			gnome gettext-runtime
GTK2_USE=			GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
GTK2_LIB_DEPENDS=		libfreetype.so:print/freetype2 \
				libfontconfig.so:x11-fonts/fontconfig
GTK2_CONFIGURE_ON=		--with-gtk=gtk2

GTK3_USES=			gnome gettext-runtime
GTK3_USE=			GNOME=atk,cairo,gdkpixbuf2,glib20,gtk30,pango
GTK3_CONFIGURE_ON=		--with-gtk=gtk3

GTK_NONE_CONFIGURE_ON=		--with-gtk=no

GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick

IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
IMAGEMAGICK_CONFIGURE_WITH=	imagemagick

JPEG_USES=			jpeg
JPEG_CONFIGURE_WITH=		jpeg

NLS_USES=			gettext
NLS_LDFLAGS=			-lintl
NLS_CONFIGURE_ENABLE=		nls

QT5_USES=			qt:5
QT5_USE=			QT=core,gui,widgets,x11extras
QT5_CONFIGURE_WITH=		qt qt5
QT5_IMPLIES=			X11

V4L_BUILD_DEPENDS=		v4l_compat>=1.0.20101027:multimedia/v4l_compat
V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
V4L_CONFIGURE_ENABLE=		video

X11_USES=			xorg
X11_USE=			XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
X11_CONFIGURE_ON=		--with-x --with-xv --with-xshm
X11_CONFIGURE_OFF=		--without-x --without-xshm --without-xv

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/zbar/distinfo (-2 / +3 lines)
1	SHA256 (zbar-0.10.tar.gz) = 575fa82de699faa7bda2d2ebbe3e1af0a4152ec4d3ad72c0ab6712d7cc9b5dd2	1	TIMESTAMP = 1613914836
2	SIZE (zbar-0.10.tar.gz) = 714457	2	SHA256 (zbar-0.23.90.tar.gz) = ff857dd7e3dbe043dac3765b5182c91dfd0477800713a75d15287d797cee60fa
		3	SIZE (zbar-0.23.90.tar.gz) = 1339761

Lines 1-11 Link Here

(-)graphics/zbar/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2019-01-09 19:05:01 UTC
2	+++ Makefile.in
3	@@ -697,7 +697,7 @@ EXTRA_DIST = $(am__append_33) $(am__append_39) $(am__a
4	perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t
5	pkgconfigdir = $(prefix)/libdata/pkgconfig
6	pkgconfig_DATA = zbar.pc $(am__append_44) $(am__append_52)
7	-dist_doc_DATA = COPYING HACKING INSTALL LICENSE NEWS README TODO \
8	+dist_doc_DATA = HACKING INSTALL NEWS README TODO \
9	$(am__append_61)
10	zincludedir = $(includedir)/zbar
11	include_HEADERS = include/zbar.h




--- configure.orig	2009-10-23 18:17:24 UTC
+++ configure
@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; 
 #define HAVE_LIBJPEG 1
 _ACEOF
 
+  have_jpeg="yes"
   LIBS="-ljpeg $LIBS"
 
 else
@@ -21735,6 +21736,7 @@ $as_echo "yes" >&6; }
 	:
 fi
    MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
+   MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"
    { $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
 $as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}
 

Line 0 Link Here

(-)graphics/zbar/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig
	2	+++ configure.ac
	3	@@ -728,7 +728,7 @@
	4	[],
	5	[with_java="check"])
	6
	7	-JAVAC=${JAVAC/ecj/ecj -1.5}
	8	+JAVAC=$(echo $JAVAC \|sed 's/ecj/ecj -1.5/')
	9
	10	dnl Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
	11	dnl look strictly at the $JAVA_HOME in order to avoid mixing different versions




--- zbarcam/scan_video.c.orig
+++ zbarcam/scan_video.c
@@ -32,7 +32,9 @@
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#ifndef __FreeBSD__
 #include <sys/sysmacros.h>
+#endif
 
 typedef void (cb_t) (void *userdata, const char *device);
 




--- zbarimg/zbarimg.c.orig	2009-10-23 18:16:44 UTC
+++ zbarimg/zbarimg.c
@@ -38,7 +38,11 @@
 #include <assert.h>
 
 #include <zbar.h>
+#if MAGICK_MAJOR < 7
 #include <wand/MagickWand.h>
+#else
+#include <MagickWand/MagickWand.h>
+#endif
 
 /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
  * (still not sure this check is quite right...




ZBar Bar Code Reader is an open source software suite for reading bar codes
from various sources, such as video streams, image files and raw intensity
sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39,
Codabar, Interleaved 2 of 5, QR Code and SQ Code.

Included with the library are basic applications for decoding captured bar
code images and using a video device (eg, webcam) as a bar code scanner. For
application developers, language bindings are included for C, C++, Python 2
and Perl as well as GUI widgets for Qt, GTK and PyGTK 2.0.
(Python, Perl, C++) ...all the way down to a streamlined C library suitable for
embedded use.

Zbar also supports sending the scanned codes via dbus, allowing its integration
with other applications.

WWW: https://github.com/mchehab/zbar/

Lines 1-30 Link Here

(-)graphics/zbar/pkg-plist (-8 / +33 lines)
1	%%V4L%%bin/zbarcam	1	%%V4L%%bin/zbarcam
		2	%%V4L%%%%GTK2%%bin/zbarcam-gtk
		3	%%V4L%%%%GTK3%%bin/zbarcam-gtk
		4	%%V4L%%%%QT5%%bin/zbarcam-qt
		5	%%GRAPHICSMAGICK%%bin/zbarimg
2	%%IMAGEMAGICK%%bin/zbarimg	6	%%IMAGEMAGICK%%bin/zbarimg
		7	%%DBUS%%etc/dbus-1/system.d/org.linuxtv.Zbar.conf
3	include/zbar.h	8	include/zbar.h
4	include/zbar/Decoder.h	9	include/zbar/Decoder.h
5	include/zbar/Exception.h	10	include/zbar/Exception.h
6	include/zbar/Image.h	11	include/zbar/Image.h
7	include/zbar/ImageScanner.h	12	include/zbar/ImageScanner.h
8	include/zbar/Processor.h	13	include/zbar/Processor.h
		14	%%QT5%%include/zbar/QZBar.h
		15	%%QT5%%include/zbar/QZBarImage.h
9	include/zbar/Scanner.h	16	include/zbar/Scanner.h
10	include/zbar/Symbol.h	17	include/zbar/Symbol.h
11	include/zbar/Video.h	18	include/zbar/Video.h
12	include/zbar/Window.h	19	include/zbar/Window.h
13	%%GTK2%%include/zbar/zbargtk.h	20	%%GTK2%%include/zbar/zbargtk.h
		21	%%GTK3%%include/zbar/zbargtk.h
14	lib/libzbar.a	22	lib/libzbar.a
15	lib/libzbar.so	23	lib/libzbar.so
16	lib/libzbar.so.0	24	lib/libzbar.so.0
17	lib/libzbar.so.0.2.0	25	lib/libzbar.so.0.3.0
		26	%%QT5%%lib/libzbarqt.a
		27	%%QT5%%lib/libzbarqt.so
		28	%%QT5%%lib/libzbarqt.so.0
		29	%%QT5%%lib/libzbarqt.so.0.1.2
		30	%%GIR%%lib/girepository-1.0/ZBar-1.0.typelib
18	%%GTK2%%lib/libzbargtk.a	31	%%GTK2%%lib/libzbargtk.a
		32	%%GTK3%%lib/libzbargtk.a
19	%%GTK2%%lib/libzbargtk.so	33	%%GTK2%%lib/libzbargtk.so
		34	%%GTK3%%lib/libzbargtk.so
20	%%GTK2%%lib/libzbargtk.so.0	35	%%GTK2%%lib/libzbargtk.so.0
		36	%%GTK3%%lib/libzbargtk.so.0
21	%%GTK2%%lib/libzbargtk.so.0.0.2	37	%%GTK2%%lib/libzbargtk.so.0.0.2
		38	%%GTK3%%lib/libzbargtk.so.0.0.2
22	%%GTK2%%libdata/pkgconfig/zbar-gtk.pc	39	%%GTK2%%libdata/pkgconfig/zbar-gtk.pc
		40	%%GTK3%%libdata/pkgconfig/zbar-gtk.pc
		41	%%QT5%%libdata/pkgconfig/zbar-qt.pc
23	libdata/pkgconfig/zbar.pc	42	libdata/pkgconfig/zbar.pc
24	%%V4L%%man/man1/zbarcam.1.gz	43	%%V4L%%%%DOCS%%man/man1/zbarcam.1.gz
25	%%IMAGEMAGICK%%man/man1/zbarimg.1.gz	44	%%DOCS%%%%GRAPHICSMAGICK%%man/man1/zbarimg.1.gz
26	%%PORTDOCS%%%%DOCSDIR%%/HACKING	45	%%DOCS%%%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
27	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	46	%%GIR%%share/gir-1.0/ZBar-1.0.gir
28	%%PORTDOCS%%%%DOCSDIR%%/NEWS	47	%%NLS%%share/locale/pt_BR/LC_MESSAGES/zbar.mo
29	%%PORTDOCS%%%%DOCSDIR%%/README	48	%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
30	%%PORTDOCS%%%%DOCSDIR%%/TODO	49	%%PORTDOCS%%%%DOCSDIR%%/COPYING
		50	%%PORTDOCS%%%%DOCSDIR%%/HACKING.md
		51	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
		52	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
		53	%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
		54	%%PORTDOCS%%%%DOCSDIR%%/README.md
		55	%%PORTDOCS%%%%DOCSDIR%%/TODO.md

Return to bug 253743

Lines 2-56 Link Here

(-)graphics/zbar/Makefile (-31 / +60 lines)
2	# $FreeBSD: head/graphics/zbar/Makefile 566155 2021-02-20 12:11:15Z tcberner $	2	# $FreeBSD: head/graphics/zbar/Makefile 566155 2021-02-20 12:11:15Z tcberner $
3		3
4	PORTNAME= zbar	4	PORTNAME= zbar
5	PORTVERSION= 0.10	5	DISTVERSION= 0.23.90
6	PORTREVISION= 20
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF	7	MASTER_SITES= https://linuxtv.org/downloads/zbar/
9		8
10	MAINTAINER= dev2@heesakkers.info	9	MAINTAINER= dev2@heesakkers.info
11	COMMENT= ZBar barcode reader	10	COMMENT= ZBar barcode reader
12		11
13	LICENSE= LGPL21	12	LICENSE= LGPL21
14		13
15	USES= iconv jpeg libtool localbase:ldflags gmake pathfix pkgconfig	14	USES= autoreconf gmake iconv libtool localbase:ldflags pathfix pkgconfig
16	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
17		16
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	INSTALL_TARGET= install-strip	18	INSTALL_TARGET= install-strip
20	CONFIGURE_ARGS= --with-jpeg=yes --with-python=no --with-qt=no	19	CONFIGURE_ARGS= --without-java --without-npapi --without-python \
		20	--enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
21		21
22	OPTIONS_DEFINE= DOCS GTK2 IMAGEMAGICK V4L X11	22	OPTIONS_DEFINE= DBUS DOCS GIR JPEG NLS QT5 V4L X11
23	OPTIONS_DEFAULT=IMAGEMAGICK X11	23	OPTIONS_DEFAULT= GTK_NONE IMAGEMAGICK JPEG NLS X11
24	OPTIONS_SUB= yes	24	OPTIONS_RADIO= MAGICK
25	V4L_DESC= Build zbarcam video scanner	25	OPTIONS_RADIO_MAGICK= GRAPHICSMAGICK IMAGEMAGICK
		26	OPTIONS_SINGLE= GTK
		27	OPTIONS_SINGLE_GTK= GTK2 GTK3 GTK_NONE
		28	OPTIONS_SUB= yes
26		29
27	X11_USES= xorg	30	GIR_DESC= Build Gobject Introspection
28	X11_USE= XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv	31	GTK_DESC= GTK support
29	X11_CONFIGURE_ON= --with-x=yes	32	GTK_NONE_DESC= Build without GTK support
30	X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv	33	GRAPHICSMAGICK_DESC= GraphicsMagick image processing support
		34	MAGICK_DESC= *Magick image processing support
		35	V4L_DESC= Build zbarcam video scanner
31		36
32	IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}	37	DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
33	IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes	38	DBUS_CONFIGURE_WITH= dbus
34	IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no
35		39
36	# To avoid patching configure even more:	40	DOCS_CONFIGURE_ENABLE= doc
37	CONFIGURE_ENV+= ac_cv_header_wand_MagickWand_h=yes
38		41
39	V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:multimedia/v4l_compat	42	GIR_USES= gnome
40	V4L_CONFIGURE_ON= --enable-video=yes	43	GIR_USE= GNOME=introspection:build
41	V4L_CONFIGURE_OFF= --enable-video=no	44	GIR_CONFIGURE_WITH= gir
42		45
43	GTK2_USES= gnome	46	GTK2_USES= gnome gettext-runtime
44	GTK2_USE= GNOME=gtk20	47	GTK2_USE= GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
45	GTK2_CONFIGURE_ON= --with-gtk=yes	48	GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
46	GTK2_CONFIGURE_OFF= --with-gtk=no	49	libfontconfig.so:x11-fonts/fontconfig
		50	GTK2_CONFIGURE_ON= --with-gtk=gtk2
47		51
48	post-patch-DOCS-off:	52	GTK3_USES= gnome gettext-runtime
49	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \	53	GTK3_USE= GNOME=atk,cairo,gdkpixbuf2,glib20,gtk30,pango
50	${WRKSRC}/Makefile.in	54	GTK3_CONFIGURE_ON= --with-gtk=gtk3
51		55
52	post-install:	56	GTK_NONE_CONFIGURE_ON= --with-gtk=no
53	# make check-plist happy	57
54	${RMDIR} ${STAGEDIR}${DATADIR}	58	GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick
		59	GRAPHICSMAGICK_CONFIGURE_WITH= graphicsmagick
		60
		61	IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
		62	IMAGEMAGICK_CONFIGURE_WITH= imagemagick
		63
		64	JPEG_USES= jpeg
		65	JPEG_CONFIGURE_WITH= jpeg
		66
		67	NLS_USES= gettext
		68	NLS_LDFLAGS= -lintl
		69	NLS_CONFIGURE_ENABLE= nls
		70
		71	QT5_USES= qt:5
		72	QT5_USE= QT=core,gui,widgets,x11extras
		73	QT5_CONFIGURE_WITH= qt qt5
		74	QT5_IMPLIES= X11
		75
		76	V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:multimedia/v4l_compat
		77	V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
		78	V4L_CONFIGURE_ENABLE= video
		79
		80	X11_USES= xorg
		81	X11_USE= XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
		82	X11_CONFIGURE_ON= --with-x --with-xv --with-xshm
		83	X11_CONFIGURE_OFF= --without-x --without-xshm --without-xv
55		84
56	.include <bsd.port.mk>	85	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)graphics/zbar/files/patch-configure (-18 lines)
1	--- configure.orig 2009-10-23 18:17:24 UTC
2	+++ configure
3	@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes;
4	#define HAVE_LIBJPEG 1
5	_ACEOF
6
7	+ have_jpeg="yes"
8	LIBS="-ljpeg $LIBS"
9
10	else
11	@@ -21735,6 +21736,7 @@ $as_echo "yes" >&6; }
12	:
13	fi
14	MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
15	+ MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}"
16	{ $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5
17	$as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;}
18

Line 0 Link Here

(-)graphics/zbar/files/patch-zbarcam_scan__video.c (+12 lines)
	1	--- zbarcam/scan_video.c.orig
	2	+++ zbarcam/scan_video.c
	3	@@ -32,7 +32,9 @@
	4
	5	#include <sys/ioctl.h>
	6	#include <sys/stat.h>
	7	+#ifndef __FreeBSD__
	8	#include <sys/sysmacros.h>
	9	+#endif
	10
	11	typedef void (cb_t) (void userdata, const char device);
	12

Lines 1-14 Link Here

(-)graphics/zbar/files/patch-zbarimg_zbarimg.c (-14 lines)
1	--- zbarimg/zbarimg.c.orig 2009-10-23 18:16:44 UTC
2	+++ zbarimg/zbarimg.c
3	@@ -38,7 +38,11 @@
4	#include <assert.h>
5
6	#include <zbar.h>
7	+#if MAGICK_MAJOR < 7
8	#include <wand/MagickWand.h>
9	+#else
10	+#include <MagickWand/MagickWand.h>
11	+#endif
12
13	/* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
14	* (still not sure this check is quite right...

Lines 1-13 Link Here

(-)graphics/zbar/pkg-descr (-11 / +12 lines)
1	ZBar is an open source software suite for reading bar codes from various	1	ZBar Bar Code Reader is an open source software suite for reading bar codes
2	sources, such as video streams, image files and raw intensity sensors. It	2	from various sources, such as video streams, image files and raw intensity
3	supports many popular symbologies (types of bar codes) including EAN-13/UPC-A,	3	sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39,
4	UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code.	4	Codabar, Interleaved 2 of 5, QR Code and SQ Code.
5		5
6	The flexible, layered implementation facilitates bar code scanning and decoding	6	Included with the library are basic applications for decoding captured bar
7	for any application: use it stand-alone with the included GUI and command line	7	code images and using a video device (eg, webcam) as a bar code scanner. For
8	programs, easily integrate a bar code scanning widget into your Qt, GTK+ or	8	application developers, language bindings are included for C, C++, Python 2
9	PyGTK GUI application, leverage one of the script or programming interfaces	9	and Perl as well as GUI widgets for Qt, GTK and PyGTK 2.0.
10	(Python, Perl, C++) ...all the way down to a streamlined C library suitable for
11	embedded use.
12		10
13	WWW: http://zbar.sourceforge.net	11	Zbar also supports sending the scanned codes via dbus, allowing its integration
		12	with other applications.
		13
		14	WWW: https://github.com/mchehab/zbar/