Bug 253743

Comment 1 Vladimir Druzenko 2021-02-21 21:34:56 UTC

Created attachment 222708 [details]
update to 0.23.90

Added fix from upstream for configure script + updates after make stage-qa.

Comment 2 Vladimir Druzenko 2021-02-21 22:07:53 UTC

All dependent ports should be recompiled.

Comment 3 Vladimir Druzenko 2021-02-21 22:27:14 UTC

Dependent ports:

1. graphics/gstreamer1-plugins-zbar - build without errors.

2. graphics/py-zbar-py - build without errors.

3. graphics/qtqr - build without errors and work fine.

4. graphics/p5-Barcode-ZBar - build error with new version of the zbar:
ZBar.xs:202:36: error: too few arguments to function call, expected 3, have 2
        zbar_version(&major, &minor);
        ~~~~~~~~~~~~               ^
/usr/local/include/zbar.h:270:1: note: 'zbar_version' declared here
extern int zbar_version(unsigned *major,
^
1 error generated.
*** [ZBar.o] Error code 1

Build fine with this patch (graphics/p5-Barcode-ZBar/files/patch-ZBar.xs): 
--- ZBar.xs.orig
+++ ZBar.xs
@@ -198,9 +198,10 @@
     PREINIT:
        unsigned major;
         unsigned minor;
+        unsigned patch;
     CODE:
-        zbar_version(&major, &minor);
-        RETVAL = newSVpvf("%u.%u", major, minor);
+        zbar_version(&major, &minor, &patch);
+        RETVAL = newSVpvf("%u.%u.%u", major, minor, patch);
     OUTPUT:
         RETVAL

Comment 4 Fernando Apesteguía 2021-02-22 12:52:37 UTC

Q/A:  /tmp/253743/graphics/zbar/files/patch-configure.ac: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
 /tmp/253743/graphics/zbar/files/patch-zbarcam_scan__video.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.

^Triage: Please confirm this change passes QA (portlint, poudriere at least).
--
https://www.freebsd.org/doc/en/books/porters-handbook/testing.html

Q/A: CONFIGURE_ARGS is out of place
# Configure block                                
GNU_CONFIGURE                         
+CONFIGURE_ARGS                      
                                                                                                            
# Make block                                                                                                
INSTALL_TARGET                                                                                              
                                                      
-CONFIGURE_ARGS                 

Thanks!

Comment 5 Vladimir Druzenko 2021-02-23 09:47:54 UTC

Created attachment 222750 [details]
update to 0.23.90 v3

(In reply to Fernando Apesteguía from comment #4)
Done.
Check, plz, are all correct?

Comment 6 Fernando Apesteguía 2021-02-23 17:02:21 UTC

(In reply to VVD from comment #5)
===========================================================================
====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: man/man1/zbarimg.1.gz
===> Error: Plist issues found.
*** Error code 1

Please, test the patches before submitting :-)

Comment 7 Vladimir Druzenko 2021-02-23 20:14:48 UTC

(In reply to Fernando Apesteguía from comment #6)
check-plist work fine for me with default options (and all other combinations I tested - 10+ different).
What options do you use?
Show full build log.

Comment 8 Fernando Apesteguía 2021-02-23 21:42:12 UTC

Created attachment 222768 [details]
poudriere build log

Poudriere log for 12.2amd64

Tested in {11,412.2}{amd64,i386}

Comment 9 Vladimir Druzenko 2021-02-24 11:40:11 UTC

Created attachment 222787 [details]
update to 0.23.90 v4

It check for xmlto and silent turn off copy of man files if not find even with configure option --enable-doc…

Comment 10 Fernando Apesteguía 2021-02-24 12:43:07 UTC

LGTM.

I'll wait a bit more to give maintainer a chance to chime in.

Comment 11 Fernando Apesteguía 2021-03-01 07:54:58 UTC

Committed,

Thanks!

Comment 12 commit-hook 2021-03-01 07:55:22 UTC

A commit references this bug:

Author: fernape
Date: Mon Mar  1 07:54:49 UTC 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)

Changes:
  head/graphics/zbar/Makefile
  head/graphics/zbar/distinfo
  head/graphics/zbar/files/patch-Makefile.in
  head/graphics/zbar/files/patch-configure
  head/graphics/zbar/files/patch-configure.ac
  head/graphics/zbar/files/patch-zbarcam_scan__video.c
  head/graphics/zbar/files/patch-zbarimg_zbarimg.c
  head/graphics/zbar/pkg-descr
  head/graphics/zbar/pkg-plist

Comment 13 Vladimir Druzenko 2021-03-01 09:08:32 UTC

kuriyama [at] FreeBSD.org, check please this patch for support graphics/p5-Barcode-ZBar new version of the graphics/zbar:
graphics/p5-Barcode-ZBar/files/patch-ZBar.xs: 
--- ZBar.xs.orig
+++ ZBar.xs
@@ -198,9 +198,10 @@
     PREINIT:
        unsigned major;
         unsigned minor;
+        unsigned patch;
     CODE:
-        zbar_version(&major, &minor);
-        RETVAL = newSVpvf("%u.%u", major, minor);
+        zbar_version(&major, &minor, &patch);
+        RETVAL = newSVpvf("%u.%u.%u", major, minor, patch);
     OUTPUT:
         RETVAL

New PR is here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253931