Bug 183572

Comment 1 Edwin Groothuis 2013-11-01 21:00:08 UTC

Maintainer of graphics/zbar,

Please note that PR ports/183572 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183572

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org

Comment 2 Edwin Groothuis 2013-11-01 21:00:09 UTC

State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

I've been getting redport reports on this for a while now, but my signup for 
redports doesn't appear to come through, so I have no system to test this on 
(unless I start building some virtual 10-CURRENT environment).

I thought this problem might be caused by a mistake on my part in the Makefile 
(currently it defines --with-jpeg=no if no libjpeg is found, where it should 
define --without-jpeg=yes).

John, do you have libjpeg installed in the cases where it breaks and if not, 
can you try installing it from graphics/jpeg and report back if it makes a 
difference? I'm thinking about scratching the option and just make jpeg 
mandatory.

I'll see if I can hurry redports along and/or create a 10-CURRENT or Dragonfly 
environment for testing.

On 11/1/2013 22:34, Oliver Heesakkers wrote:
> I've been getting redport reports on this for a while now, but my signup for 
> redports doesn't appear to come through, so I have no system to test this on 
> (unless I start building some virtual 10-CURRENT environment).
> 
> I thought this problem might be caused by a mistake on my part in the Makefile 
> (currently it defines --with-jpeg=no if no libjpeg is found, where it should 
> define --without-jpeg=yes).
> 
> John, do you have libjpeg installed in the cases where it breaks and if not, 
> can you try installing it from graphics/jpeg and report back if it makes a 
> difference? I'm thinking about scratching the option and just make jpeg 
> mandatory.
> 
> I'll see if I can hurry redports along and/or create a 10-CURRENT or Dragonfly 
> environment for testing.
> 

Oliver, I already tested this patch, even in redports.
before: https://redports.org/buildarchive/20131101122006-51733/
after: https://redports.org/buildarchive/20131101195201-53133/
after: https://redports.org/buildarchive/20131101195231-62209/

And of course in FreeBSD 8.4 and DragonFly 3.5 (my machines).

The issue is as I said: the configure test is bad.  Libjpeg is there.  I
checked in poudriere testport even.

John

I submit for inclusion in the ports tree the attached update to graphics/zbar.

Changes:
- Jpeg is now a requirement.
- Patch to unbreak build on 10 (and reportedly DragonflyBSD) (John Marino).

Requiring jpeg brings the possibility that the package changes in a way that 
PORTREVISION needs to be be upped. However this is highly unlikely, so I 
didn't do that.

Comment 6 John Marino 2013-11-12 10:02:39 UTC

Responsible Changed
From-To: freebsd-ports-bugs->marino

I'll take it.

Comment 7 John Marino 2013-11-12 10:04:17 UTC

State Changed
From-To: feedback->open

Maintainer has fixed.

Comment 8 dfilter service 2013-11-18 10:05:56 UTC

Author: marino
Date: Mon Nov 18 10:05:48 2013
New Revision: 334167
URL: http://svnweb.freebsd.org/changeset/ports/334167

Log:
  graphics/zbar: Unbreak on F10 and DragonFly
  
  PR:		ports/183572
  Submitted by:	marino
  Approved by:	Oliver Heesakkers (maintainer, modified)

Added:
  head/graphics/zbar/files/patch-configure   (contents, props changed)
Modified:
  head/graphics/zbar/Makefile

Modified: head/graphics/zbar/Makefile
==============================================================================
--- head/graphics/zbar/Makefile	Mon Nov 18 09:52:42 2013	(r334166)
+++ head/graphics/zbar/Makefile	Mon Nov 18 10:05:48 2013	(r334167)
@@ -12,10 +12,14 @@ COMMENT=	ZBar barcode reader
 
 LICENSE=	LGPL21
 
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		iconv gmake pkgconfig
 
+CONFIGURE_ARGS=		--with-jpeg=yes
+
 OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4
 OPTIONS_DEFAULT=	X11 IMAGEMAGICK
 V4L_DESC=	Build zbarcam video scanner
@@ -23,13 +27,6 @@ V4L_DESC=	Build zbarcam video scanner
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libjpeg.so)
-CONFIGURE_ARGS+=	--with-jpeg=yes
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
-.else
-CONFIGURE_ARGS+=	--with-jpeg=no
-.endif
-
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xv
 CONFIGURE_ARGS+=	--with-x=yes

Added: head/graphics/zbar/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/zbar/files/patch-configure	Mon Nov 18 10:05:48 2013	(r334167)
@@ -0,0 +1,10 @@
+--- configure.orig	2009-10-23 18:17:24.000000000 +0000
++++ configure
+@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_head
+ #define HAVE_LIBJPEG 1
+ _ACEOF
+ 
++  have_jpeg="yes"
+   LIBS="-ljpeg $LIBS"
+ 
+ else
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 9 John Marino 2013-11-18 10:11:26 UTC

State Changed
From-To: open->closed

Committed, with minor changes. Thanks!