Date: Mon, 1 Mar 2021 07:54:48 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566831 - in head/graphics/zbar: . files Message-ID: <202103010754.1217sm3G097072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Mon Mar 1 07:54:48 2021 New Revision: 566831 URL: https://svnweb.freebsd.org/changeset/ports/566831 Log: graphics/zbar: update to 0.23.90 ChangeLog: https://github.com/mchehab/zbar/releases/tag/0.23.90 PR: 253743 Submitted by: vvd@unislabs.com Approved by: dev2@heesakkers.info (maintainer, timemout > 1 week) Added: head/graphics/zbar/files/patch-configure.ac (contents, props changed) head/graphics/zbar/files/patch-zbarcam_scan__video.c (contents, props changed) Deleted: head/graphics/zbar/files/patch-Makefile.in head/graphics/zbar/files/patch-configure head/graphics/zbar/files/patch-zbarimg_zbarimg.c Modified: head/graphics/zbar/Makefile head/graphics/zbar/distinfo head/graphics/zbar/pkg-descr head/graphics/zbar/pkg-plist Modified: head/graphics/zbar/Makefile ============================================================================== --- head/graphics/zbar/Makefile Mon Mar 1 07:53:45 2021 (r566830) +++ head/graphics/zbar/Makefile Mon Mar 1 07:54:48 2021 (r566831) @@ -2,55 +2,86 @@ # $FreeBSD$ 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 +CONFIGURE_ARGS= --without-java --without-npapi --without-python \ + --enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417 + INSTALL_TARGET= install-strip -CONFIGURE_ARGS= --with-jpeg=yes --with-python=no --with-qt=no -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_BUILD_DEPENDS= xmlto:textproc/xmlto +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> Modified: head/graphics/zbar/distinfo ============================================================================== --- head/graphics/zbar/distinfo Mon Mar 1 07:53:45 2021 (r566830) +++ head/graphics/zbar/distinfo Mon Mar 1 07:54:48 2021 (r566831) @@ -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 Added: head/graphics/zbar/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/zbar/files/patch-configure.ac Mon Mar 1 07:54:48 2021 (r566831) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2021-02-13 12:56:31 UTC ++++ configure.ac +@@ -728,7 +728,7 @@ AC_ARG_WITH([java], + [], + [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 Added: head/graphics/zbar/files/patch-zbarcam_scan__video.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/zbar/files/patch-zbarcam_scan__video.c Mon Mar 1 07:54:48 2021 (r566831) @@ -0,0 +1,12 @@ +--- zbarcam/scan_video.c.orig 2021-02-13 09:54:57 UTC ++++ 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); + Modified: head/graphics/zbar/pkg-descr ============================================================================== --- head/graphics/zbar/pkg-descr Mon Mar 1 07:53:45 2021 (r566830) +++ head/graphics/zbar/pkg-descr Mon Mar 1 07:54:48 2021 (r566831) @@ -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/ Modified: head/graphics/zbar/pkg-plist ============================================================================== --- head/graphics/zbar/pkg-plist Mon Mar 1 07:53:45 2021 (r566830) +++ head/graphics/zbar/pkg-plist Mon Mar 1 07:54:48 2021 (r566831) @@ -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 +%%DOCS%%%%V4L%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103010754.1217sm3G097072>