From owner-svn-ports-head@freebsd.org Sun Nov 10 22:01:54 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 471801ABE08; Sun, 10 Nov 2019 22:01:54 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47B7Jf16kpz4RnG; Sun, 10 Nov 2019 22:01:54 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AA475A1B; Sun, 10 Nov 2019 22:01:54 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAAM1rS4008904; Sun, 10 Nov 2019 22:01:53 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAAM1rJB008903; Sun, 10 Nov 2019 22:01:53 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201911102201.xAAM1rJB008903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 10 Nov 2019 22:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517234 - head/graphics/vips X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: head/graphics/vips X-SVN-Commit-Revision: 517234 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2019 22:01:54 -0000 Author: danilo Date: Sun Nov 10 22:01:53 2019 New Revision: 517234 URL: https://svnweb.freebsd.org/changeset/ports/517234 Log: - Convert hardcoded dependencies to options - Defaults magick to ImageMagick (vips uses it by default) PR: 241851 Submitted by: ale Modified: head/graphics/vips/Makefile Modified: head/graphics/vips/Makefile ============================================================================== --- head/graphics/vips/Makefile Sun Nov 10 22:00:07 2019 (r517233) +++ head/graphics/vips/Makefile Sun Nov 10 22:01:53 2019 (r517234) @@ -3,6 +3,7 @@ PORTNAME= vips PORTVERSION= 8.8.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/ @@ -13,36 +14,22 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash -LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ - liborc-0.4.so:devel/orc \ - libGraphicsMagick.so:graphics/GraphicsMagick \ - libIlmImf.so:graphics/openexr \ - liblcms2.so:graphics/lcms2 \ - libexif.so:graphics/libexif \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ - libwebp.so:graphics/webp \ - libfftw3.so:math/fftw3 \ - libmatio.so:math/matio \ - libgirepository-1.0.so:devel/gobject-introspection \ +LIB_DEPENDS= libgirepository-1.0.so:devel/gobject-introspection \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libgif.so:graphics/giflib \ - libpoppler-glib.so:graphics/poppler-glib \ - libImath.so:graphics/ilmbase \ - libhdf5.so:science/hdf5 \ - libexpat.so:textproc/expat2 \ - libcurl.so:ftp/curl + libexpat.so:textproc/expat2 -USES= compiler:c++11-lang cpe gettext gmake gnome jpeg libtool \ - pathfix pkgconfig python:2.7 shebangfix +USES= compiler:c++11-lang cpe gettext gmake gnome libtool \ + pathfix pkgconfig python shebangfix SHEBANG_FILES= tools/vips-${PORTVERSION:R} tools/vipsprofile -USE_GNOME= cairo gdkpixbuf2 glib20 libgsf librsvg2 libxml2 pango +USE_GNOME= glib20 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-x \ +CONFIGURE_ARGS+= --without-nifti \ --without-openslide \ - --with-magickpackage=GraphicsMagick + --without-pdfium \ + --without-imagequant + INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -51,9 +38,89 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION:R}" -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS X11 GSF FFTW ORC LCMS2 OPENEXR HEIF POPPLER LIBRSVG2 MATIO CFITSIO WEBP PANGO TIFF GIF PNG JPEG LIBEXIF +OPTIONS_RADIO= MAGICK +OPTIONS_RADIO_MAGICK= IMAGEMAGICK GRAPHMAGICK +OPTIONS_DEFAULT= X11 GSF FFTW ORC LCMS2 OPENEXR HEIF POPPLER LIBRSVG2 MATIO CFITSIO WEBP PANGO TIFF GIF PNG JPEG LIBEXIF IMAGEMAGICK DOCS_CONFIGURE_ENABLE= gtk-doc gtk-doc-html DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc + +X11_CONFIGURE_WITH= x + +IMAGEMAGICK_CONFIGURE_ON= --with-magickpackage=MagickCore +GRAPHMAGICK_CONFIGURE_ON= --with-magickpackage=GraphicsMagick + +GSF_DESC= Structured file formats support +GSF_CONFIGURE_WITH= gsf +GSF_USE= GNOME=libgsf + +FFTW_CONFIGURE_WITH= fftw +FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 + +ORC_DESC= ORC language support +ORC_CONFIGURE_WITH= orc +ORC_LIB_DEPENDS= liborc-0.4.so:devel/orc + +LCMS2_CONFIGURE_WITH= lcms +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 + +OPENEXR_CONFIGURE_WITH= OpenEXR +OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ + libImath.so:graphics/ilmbase + +HEIF_DESC= HEIF image format support +HEIF_CONFIGURE_WITH= heif +HEIF_LIB_DEPENDS= libheif.so:graphics/libheif + +POPPLER_CONFIGURE_WITH= poppler +POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib +POPPLER_USE= GNOME=cairo + +LIBRSVG2_CONFIGURE_WITH=rsvg +LIBRSVG2_USE= GNOME=librsvg2 GNOME=cairo + +MATIO_DESC= Matlab MAT format support +MATIO_CONFIGURE_WITH= matio +MATIO_LIB_DEPENDS= libmatio.so:math/matio \ + libhdf5.so:science/hdf5 + +CFITSIO_CONFIGURE_WITH= cfitsio +CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio + +WEBP_CONFIGURE_WITH= libwebp +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp + +PANGO_CONFIGURE_WITH= pangoft2 +PANGO_USE= GNOME=pango + +TIFF_CONFIGURE_WITH= tiff +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff + +GIF_CONFIGURE_WITH= giflib +GIF_LIB_DEPENDS= libgif.so:graphics/giflib + +PNG_CONFIGURE_WITH= png +PNG_LIB_DEPENDS= libpng.so:graphics/png + +JPEG_CONFIGURE_WITH= jpeg +JPEG_USES= jpeg + +LIBEXIF_CONFIGURE_WITH= libexif +LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif + +.include + +.if ${PORT_OPTIONS:MIMAGEMAGICK} +. if ${PORT_OPTIONS:MX11} +LIB_DEPENDS+= libMagickCore-7.so:graphics/ImageMagick7 +. else +LIB_DEPENDS+= libMagickCore-7.so:graphics/ImageMagick7-nox11 +. endif +.elif ${PORT_OPTIONS:MGRAPHMAGICK} +LIB_DEPENDS+= libGraphicsMagick.so:graphics/GraphicsMagick +.else +CONFIGURE_ARGS+= --without-magick +.endif .include