Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Mar 2021 22:21:41 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567696 - head/multimedia/py-moviepy
Message-ID:  <202103072221.127MLfkO048395@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar  7 22:21:41 2021
New Revision: 567696
URL: https://svnweb.freebsd.org/changeset/ports/567696

Log:
  Revert r566733
  
  IMAGEMAGICK_DEFAULT is not widely adopted.
  Furthermore, this commit is not approved.
  It should be applied ports tree wide with approvals from maintainers.

Modified:
  head/multimedia/py-moviepy/Makefile

Modified: head/multimedia/py-moviepy/Makefile
==============================================================================
--- head/multimedia/py-moviepy/Makefile	Sun Mar  7 22:21:35 2021	(r567695)
+++ head/multimedia/py-moviepy/Makefile	Sun Mar  7 22:21:41 2021	(r567696)
@@ -13,7 +13,6 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
-		convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<5.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=2.5<3.0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
@@ -26,5 +25,13 @@ USES=		python:3.4+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
+
+OPTIONS_SINGLE=	IMAGEMAGICK
+OPTIONS_SINGLE_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
+OPTIONS_DEFAULT=IMAGEMAGICK7
+IMAGEMAGICK6_DESC=	Use ImageMagick 6.x as backend
+IMAGEMAGICK7_DESC=	Use ImageMagick 7.x as backend
+IMAGEMAGICK6_RUN_DEPENDS=	convert:graphics/ImageMagick6
+IMAGEMAGICK7_RUN_DEPENDS=	convert:graphics/ImageMagick7
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103072221.127MLfkO048395>