Date: Fri, 21 Sep 2018 18:37:30 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480301 - in head/graphics: ImageMagick ImageMagick7 Message-ID: <201809211837.w8LIbU1U018468@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Sep 21 18:37:30 2018 New Revision: 480301 URL: https://svnweb.freebsd.org/changeset/ports/480301 Log: graphics/ImageMagick[7]: remove CONFLICTS with lang/execline - lang/execline dropped their bin/import, so it no longer conflicts PR: 185818 Submitted by: mj@netauth.com Approved by: koobs (maintainer timeout) Modified: head/graphics/ImageMagick/Makefile head/graphics/ImageMagick7/Makefile Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Fri Sep 21 18:20:32 2018 (r480300) +++ head/graphics/ImageMagick/Makefile Fri Sep 21 18:37:30 2018 (r480301) @@ -38,8 +38,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl PORTSCOUT?= limit:^6\.9\. -CONFLICTS_INSTALL= execline-[0-9]* # bin/import -CONFLICTS_INSTALL+= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config +CONFLICTS_INSTALL= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ Modified: head/graphics/ImageMagick7/Makefile ============================================================================== --- head/graphics/ImageMagick7/Makefile Fri Sep 21 18:20:32 2018 (r480300) +++ head/graphics/ImageMagick7/Makefile Fri Sep 21 18:37:30 2018 (r480301) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.7-16 +DISTVERSION= 7.0.8-10 PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -36,8 +36,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl -CONFLICTS_INSTALL= execline-[0-9]* # bin/import -CONFLICTS_INSTALL+= ImageMagick ImageMagick-nox11 # bin/Magick++-config +CONFLICTS_INSTALL= ImageMagick ImageMagick-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ @@ -61,7 +60,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ - THREADS X11 16BIT_PIXEL HDRI + THREADS X11 16BIT_PIXEL HDRI HEIF OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ TIFF WEBP WMF THREADS X11 HDRI @@ -362,6 +361,18 @@ USES+= ghostscript:x11 . else USES+= ghostscript . endif +.endif + +## HEIF (High EfficiencImage Format) support +HEIF_DESC= High Efficiency Image File support (e.g. from iPhone) + +.if ${PORT_OPTIONS:MHEIF} +LIB_DEPENDS+= libheif.so:graphics/libheif +CONFIGURE_ARGS+= --with-heic +PLIST_SUB+= HEIF="" +.else +CONFIGURE_ARGS+= --without-heic +PLIST_SUB+= HEIF="@comment " .endif .if ! ${PORT_OPTIONS:MX11}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809211837.w8LIbU1U018468>