Attachment 222708 Details for Bug 253743 – update to 0.23.90

[patch] update to 0.23.90

zbar-v2.diff (text/plain), 10.87 KB, created by Vladimir Druzenko on 2021-02-21 21:34:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-02-21 21:34:56 UTC

Size: 10.87 KB

patch

obsolete

>diff -urN graphics/zbar.orig/Makefile graphics/zbar/Makefile
>--- graphics/zbar.orig/Makefile
>+++ graphics/zbar/Makefile
>@@ -2,55 +2,84 @@
> # $FreeBSD: head/graphics/zbar/Makefile 566155 2021-02-20 12:11:15Z tcberner $
> 
> PORTNAME=	zbar
>-PORTVERSION=	0.10
>-PORTREVISION=	20
>+DISTVERSION=	0.23.90
> CATEGORIES=	graphics
>-MASTER_SITES=	SF
>+MASTER_SITES=	https://linuxtv.org/downloads/zbar/
> 
> MAINTAINER=	dev2@heesakkers.info
> COMMENT=	ZBar barcode reader
> 
> LICENSE=	LGPL21
> 
>-USES=		iconv jpeg libtool localbase:ldflags gmake pathfix pkgconfig
>+USES=		autoreconf gmake iconv libtool localbase:ldflags pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-CONFIGURE_ARGS=	--with-jpeg=yes --with-python=no --with-qt=no
>+CONFIGURE_ARGS=	--without-java --without-npapi --without-python \
>+		--enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
> 
>-OPTIONS_DEFINE=	DOCS GTK2 IMAGEMAGICK V4L X11
>-OPTIONS_DEFAULT=IMAGEMAGICK X11
>-OPTIONS_SUB=	yes
>-V4L_DESC=	Build zbarcam video scanner
>+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
> 
>-X11_USES=	xorg
>-X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
>-X11_CONFIGURE_ON=	--with-x=yes
>-X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
>+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
> 
>-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
>-IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
>-IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
>+DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
>+DBUS_CONFIGURE_WITH=		dbus
> 
>-# To avoid patching configure even more:
>-CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
>+DOCS_CONFIGURE_ENABLE=		doc
> 
>-V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20101027:multimedia/v4l_compat
>-V4L_CONFIGURE_ON=	--enable-video=yes
>-V4L_CONFIGURE_OFF=	--enable-video=no
>+GIR_USES=			gnome
>+GIR_USE=			GNOME=introspection:build
>+GIR_CONFIGURE_WITH=		gir
> 
>-GTK2_USES=	gnome
>-GTK2_USE=	GNOME=gtk20
>-GTK2_CONFIGURE_ON=	--with-gtk=yes
>-GTK2_CONFIGURE_OFF=	--with-gtk=no
>+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
> 
>-post-patch-DOCS-off:
>-	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
>-		${WRKSRC}/Makefile.in
>+GTK3_USES=			gnome gettext-runtime
>+GTK3_USE=			GNOME=atk,cairo,gdkpixbuf2,glib20,gtk30,pango
>+GTK3_CONFIGURE_ON=		--with-gtk=gtk3
> 
>-post-install:
>-	# make check-plist happy
>-	${RMDIR} ${STAGEDIR}${DATADIR}
>+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>
>diff -urN graphics/zbar.orig/distinfo graphics/zbar/distinfo
>--- graphics/zbar.orig/distinfo
>+++ graphics/zbar/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (zbar-0.10.tar.gz) = 575fa82de699faa7bda2d2ebbe3e1af0a4152ec4d3ad72c0ab6712d7cc9b5dd2
>-SIZE (zbar-0.10.tar.gz) = 714457
>+TIMESTAMP = 1613914836
>+SHA256 (zbar-0.23.90.tar.gz) = ff857dd7e3dbe043dac3765b5182c91dfd0477800713a75d15287d797cee60fa
>+SIZE (zbar-0.23.90.tar.gz) = 1339761
>diff -urN graphics/zbar.orig/files/patch-Makefile.in graphics/zbar/files/patch-Makefile.in
>--- graphics/zbar.orig/files/patch-Makefile.in
>+++ graphics/zbar/files/patch-Makefile.in
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2019-01-09 19:05:01 UTC
>-+++ Makefile.in
>-@@ -697,7 +697,7 @@ EXTRA_DIST = $(am__append_33) $(am__append_39) $(am__a
>- 	perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t
>- pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = zbar.pc $(am__append_44) $(am__append_52)
>--dist_doc_DATA = COPYING HACKING INSTALL LICENSE NEWS README TODO \
>-+dist_doc_DATA = HACKING INSTALL NEWS README TODO \
>- 	$(am__append_61)
>- zincludedir = $(includedir)/zbar
>- include_HEADERS = include/zbar.h
>diff -urN graphics/zbar.orig/files/patch-configure graphics/zbar/files/patch-configure
>--- graphics/zbar.orig/files/patch-configure
>+++ graphics/zbar/files/patch-configure
>@@ -1,18 +0,0 @@
>---- 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;}
>- 
>diff -urN graphics/zbar.orig/files/patch-configure.ac graphics/zbar/files/patch-configure.ac
>--- graphics/zbar.orig/files/patch-configure.ac
>+++ graphics/zbar/files/patch-configure.ac
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig
>++++ configure.ac
>+@@ -728,7 +728,7 @@
>+   [],
>+   [with_java="check"])
>+ 
>+-JAVAC=${JAVAC/ecj/ecj -1.5}
>++JAVAC=$(echo $JAVAC |sed 's/ecj/ecj -1.5/')
>+ 
>+ dnl Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
>+ dnl look strictly at the $JAVA_HOME in order to avoid mixing different versions
>diff -urN graphics/zbar.orig/files/patch-zbarcam_scan__video.c graphics/zbar/files/patch-zbarcam_scan__video.c
>--- graphics/zbar.orig/files/patch-zbarcam_scan__video.c
>+++ graphics/zbar/files/patch-zbarcam_scan__video.c
>@@ -0,0 +1,12 @@
>+--- 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);
>+ 
>diff -urN graphics/zbar.orig/files/patch-zbarimg_zbarimg.c graphics/zbar/files/patch-zbarimg_zbarimg.c
>--- graphics/zbar.orig/files/patch-zbarimg_zbarimg.c
>+++ graphics/zbar/files/patch-zbarimg_zbarimg.c
>@@ -1,14 +0,0 @@
>---- 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...
>diff -urN graphics/zbar.orig/pkg-descr graphics/zbar/pkg-descr
>--- graphics/zbar.orig/pkg-descr
>+++ graphics/zbar/pkg-descr
>@@ -1,13 +1,14 @@
>-ZBar 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 many popular symbologies (types of bar codes) including EAN-13/UPC-A,
>-UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code.
>+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.
> 
>-The flexible, layered implementation facilitates bar code scanning and decoding
>-for any application: use it stand-alone with the included GUI and command line
>-programs, easily integrate a bar code scanning widget into your Qt, GTK+ or
>-PyGTK GUI application, leverage one of the script or programming interfaces
>-(Python, Perl, C++) ...all the way down to a streamlined C library suitable for
>-embedded use.
>+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.
> 
>-WWW: http://zbar.sourceforge.net
>+Zbar also supports sending the scanned codes via dbus, allowing its integration
>+with other applications.
>+
>+WWW: https://github.com/mchehab/zbar/
>diff -urN graphics/zbar.orig/pkg-plist graphics/zbar/pkg-plist
>--- graphics/zbar.orig/pkg-plist
>+++ graphics/zbar/pkg-plist
>@@ -1,30 +1,55 @@
> %%V4L%%bin/zbarcam
>+%%V4L%%%%GTK2%%bin/zbarcam-gtk
>+%%V4L%%%%GTK3%%bin/zbarcam-gtk
>+%%V4L%%%%QT5%%bin/zbarcam-qt
>+%%GRAPHICSMAGICK%%bin/zbarimg
> %%IMAGEMAGICK%%bin/zbarimg
>+%%DBUS%%etc/dbus-1/system.d/org.linuxtv.Zbar.conf
> include/zbar.h
> include/zbar/Decoder.h
> include/zbar/Exception.h
> include/zbar/Image.h
> include/zbar/ImageScanner.h
> include/zbar/Processor.h
>+%%QT5%%include/zbar/QZBar.h
>+%%QT5%%include/zbar/QZBarImage.h
> include/zbar/Scanner.h
> include/zbar/Symbol.h
> include/zbar/Video.h
> include/zbar/Window.h
> %%GTK2%%include/zbar/zbargtk.h
>+%%GTK3%%include/zbar/zbargtk.h
> lib/libzbar.a
> lib/libzbar.so
> lib/libzbar.so.0
>-lib/libzbar.so.0.2.0
>+lib/libzbar.so.0.3.0
>+%%QT5%%lib/libzbarqt.a
>+%%QT5%%lib/libzbarqt.so
>+%%QT5%%lib/libzbarqt.so.0
>+%%QT5%%lib/libzbarqt.so.0.1.2
>+%%GIR%%lib/girepository-1.0/ZBar-1.0.typelib
> %%GTK2%%lib/libzbargtk.a
>+%%GTK3%%lib/libzbargtk.a
> %%GTK2%%lib/libzbargtk.so
>+%%GTK3%%lib/libzbargtk.so
> %%GTK2%%lib/libzbargtk.so.0
>+%%GTK3%%lib/libzbargtk.so.0
> %%GTK2%%lib/libzbargtk.so.0.0.2
>+%%GTK3%%lib/libzbargtk.so.0.0.2
> %%GTK2%%libdata/pkgconfig/zbar-gtk.pc
>+%%GTK3%%libdata/pkgconfig/zbar-gtk.pc
>+%%QT5%%libdata/pkgconfig/zbar-qt.pc
> libdata/pkgconfig/zbar.pc
>-%%V4L%%man/man1/zbarcam.1.gz
>-%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
>-%%PORTDOCS%%%%DOCSDIR%%/HACKING
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>+%%V4L%%%%DOCS%%man/man1/zbarcam.1.gz
>+%%DOCS%%%%GRAPHICSMAGICK%%man/man1/zbarimg.1.gz
>+%%DOCS%%%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
>+%%GIR%%share/gir-1.0/ZBar-1.0.gir
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/zbar.mo
>+%%NLS%%%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/HACKING.md
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/TODO.md

Actions: View | Diff

Attachments on bug 253743: 222700 | 222708 | 222750 | 222768 | 222787