Attachment 200964 Details for Bug 221391 – patch-selectable-imagick-version

[patch] patch-selectable-imagick-version

zbar3.diff (text/plain), 2.14 KB, created by Kurt Jaeger on 2019-01-09 18:50:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2019-01-09 18:50:23 UTC

Size: 2.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 489751)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zbar
> PORTVERSION=	0.10
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> 
>@@ -12,15 +12,18 @@
> 
> LICENSE=	LGPL21
> 
>+USES=		iconv jpeg libtool gmake pathfix pkgconfig
>+USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>-USES=		iconv jpeg libtool gmake pathfix pkgconfig
>+
> INSTALL_TARGET=	install-strip
> 
> CONFIGURE_ARGS=	--with-jpeg=yes
> 
>-OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS
>-OPTIONS_DEFAULT=X11 IMAGEMAGICK
>+OPTIONS_DEFINE=	X11 V4L PYTHON GTK2 QT4 DOCS
>+OPTIONS_DEFAULT=X11 V7
>+OPTIONS_RADIO=	IMAGEMAGICK
>+OPTIONS_RADIO_IMAGEMAGICK=	V6 V7
> OPTIONS_SUB=	yes
> V4L_DESC=	Build zbarcam video scanner
> 
>@@ -28,10 +31,16 @@
> X11_CONFIGURE_ON=	--with-x=yes
> X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
> 
>-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
>-IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
>-IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
>+V6_DESC=	With ImageMagick6
>+V6_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
>+V6_CONFIGURE_ON=	--with-imagemagick=yes
>+V6_CONFIGURE_OFF=	--with-imagemagick=no
> 
>+V7_DESC=	With ImageMagick7
>+V7_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
>+V7_CONFIGURE_ON=	--with-imagemagick=yes
>+V7_CONFIGURE_OFF=	--with-imagemagick=no
>+
> # To avoid patching configure even more:
> CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 489751)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> %%V4L%%bin/zbarcam
>-%%IMAGEMAGICK%%bin/zbarimg
>+%%V6%%bin/zbarimg
>+%%V7%%bin/zbarimg
> include/zbar.h
> include/zbar/Decoder.h
> include/zbar/Exception.h
>@@ -29,7 +30,8 @@
> %%QT4%%libdata/pkgconfig/zbar-qt.pc
> libdata/pkgconfig/zbar.pc
> %%V4L%%man/man1/zbarcam.1.gz
>-%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
>+%%V6%%man/man1/zbarimg.1.gz
>+%%V7%%man/man1/zbarimg.1.gz
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so
> %%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so
> %%PORTDOCS%%%%DOCSDIR%%/HACKING

Actions: View | Diff

Attachments on bug 221391: 185235 | 200964 | 200965