From owner-dev-commits-ports-all@freebsd.org Fri Jun 18 15:40:01 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 AC8EB648920; Fri, 18 Jun 2021 15:40:01 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G635Y4Vvqz4p3F; Fri, 18 Jun 2021 15:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8303D251C5; Fri, 18 Jun 2021 15:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15IFe1Bb079144; Fri, 18 Jun 2021 15:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15IFe1LP079132; Fri, 18 Jun 2021 15:40:01 GMT (envelope-from git) Date: Fri, 18 Jun 2021 15:40:01 GMT Message-Id: <202106181540.15IFe1LP079132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: beb4adb31351 - main - graphics/ImageMagick[6-7]: optionize the dependency on ffmpeg MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beb4adb31351f1ea43b1aa2e53a6213d16208ce7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 15:40:01 -0000 The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=beb4adb31351f1ea43b1aa2e53a6213d16208ce7 commit beb4adb31351f1ea43b1aa2e53a6213d16208ce7 Author: Thierry Thomas AuthorDate: 2021-06-18 15:29:26 +0000 Commit: Thierry Thomas CommitDate: 2021-06-18 15:39:42 +0000 graphics/ImageMagick[6-7]: optionize the dependency on ffmpeg - Make an option for FFMPEG, and do not enable it by default. - Do not bump PORTREVISION: pkg will take care of it, and ports users may rebuild it if needed. - Note: there is no simple way to deactivate this option when ffmpeg is already installed. PR: 256215 Reported by: Toshimichi Masubuchi (ImageMagick7) and gessel (6) Approved by: maintainer’s time-out --- graphics/ImageMagick6/Makefile | 12 +++++++++--- graphics/ImageMagick7/Makefile | 11 ++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index 704682077510..ea7516006de8 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -32,8 +32,7 @@ COMMENT= Image processing tools (legacy version) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libltdl.so:devel/libltdl \ - libavutil.so:multimedia/ffmpeg +LIB_DEPENDS= libltdl.so:devel/libltdl TESTS_DEPENDS= gsfonts>=0:print/gsfonts @@ -63,7 +62,7 @@ SAMPLE_FILES= coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_SUB= yes -OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ +OPTIONS_DEFINE= BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB HEIF JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \ THREADS X11 16BIT_PIXEL HDRI RAW @@ -87,6 +86,8 @@ PLIST_SUB+= QBIT=${_QBIT} BZIP2_DESC= bzip2 compressed MIFF images BZIP2_CONFIGURE_WITH= bzlib +FFMPEG_DESC= Video CODEC support from FFmpeg + FFTW_CONFIGURE_WITH= fftw FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 @@ -265,6 +266,11 @@ CONFIGURE_ARGS+= --without-djvu PLIST_SUB+= DJVU="@comment " .endif +.if ${PORT_OPTIONS:MFFMPEG} +BUILD_DEPENDS+= ffmpeg:multimedia/ffmpeg +RUN_DEPENDS+= ffmpeg:multimedia/ffmpeg +.endif + .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib . if ${PORT_OPTIONS:MX11} diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index a30bef93ac11..4b138cc740d1 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -32,8 +32,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl \ - libzip.so:archivers/libzip \ - libavutil.so:multimedia/ffmpeg + libzip.so:archivers/libzip TESTS_DEPENDS= gsfonts>=0:print/gsfonts @@ -62,7 +61,7 @@ SAMPLE_FILES= colors.xml delegates.xml log.xml mime.xml policy.xml \ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_SUB= yes -OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ +OPTIONS_DEFINE= BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \ THREADS X11 16BIT_PIXEL HDRI HEIF RAW @@ -72,6 +71,7 @@ OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support +FFMPEG_DESC= VIDEO codec support as FFmpeg TESTS_DESC= Run bundled self-tests after build #SIMD_CONFIGURE_WITH= gcc-arch CONFIGURE_ARGS+= --without-gcc-arch @@ -302,6 +302,11 @@ USES+= ghostscript RUN_DEPENDS+= gsfonts>=0:print/gsfonts .endif +.if ${PORT_OPTIONS:MFFMPEG} +BUILD_DEPENDS+= ffmpeg:multimedia/ffmpeg +RUN_DEPENDS+= ffmpeg:multimedia/ffmpeg +.endif + .if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install-strip install-docDATA install-data-html .else