Date: Sat, 9 Nov 2013 20:10:02 GMT From: Oliver Heesakkers <dev2@heesakkers.info> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/183572: [PATCH] graphics/zbar: Unbreak on FreeBSD 10 (and DragonFly) Message-ID: <201311092010.rA9KA2wZ098744@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/183572; it has been noted by GNATS.
From: Oliver Heesakkers <dev2@heesakkers.info>
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/183572: [PATCH] graphics/zbar: Unbreak on FreeBSD 10 (and DragonFly)
Date: Sat, 09 Nov 2013 21:01:12 +0100
This is a multi-part message in MIME format.
--nextPart2071947.70pAsMqHus
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
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.
--nextPart2071947.70pAsMqHus
Content-Disposition: attachment; filename="patch.txt"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="patch.txt"
Index: Makefile
===================================================================
--- Makefile (revision 333324)
+++ Makefile (working copy)
@@ -12,10 +12,14 @@
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 @@
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
Index: files/patch-configure
===================================================================
--- files/patch-configure (revision 0)
+++ files/patch-configure (working copy)
@@ -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
Property changes on: files/patch-configure
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--nextPart2071947.70pAsMqHus--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311092010.rA9KA2wZ098744>