Index: head/multimedia/py-moviepy/Makefile =================================================================== --- head/multimedia/py-moviepy/Makefile (revision 487620) +++ head/multimedia/py-moviepy/Makefile (revision 487621) @@ -1,34 +1,35 @@ # $FreeBSD$ PORTNAME= moviepy PORTVERSION= 0.2.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Video editing with Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>=2.1.2:graphics/py-imageio@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2:misc/py-tqdm@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2:misc/py-tqdm@${PY_FLAVOR} \ + ffmpeg:multimedia/ffmpeg USES= python 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 Index: head/multimedia/py-moviepy/files/patch-moviepy_config__defaults.py =================================================================== --- head/multimedia/py-moviepy/files/patch-moviepy_config__defaults.py (nonexistent) +++ head/multimedia/py-moviepy/files/patch-moviepy_config__defaults.py (revision 487621) @@ -0,0 +1,12 @@ +--- moviepy/config_defaults.py.orig 2018-12-16 18:28:09 UTC ++++ moviepy/config_defaults.py +@@ -50,5 +50,6 @@ IMAGEMAGICK_BINARY + + import os + +-FFMPEG_BINARY = os.getenv('FFMPEG_BINARY', 'ffmpeg-imageio') +-IMAGEMAGICK_BINARY = os.getenv('IMAGEMAGICK_BINARY', 'auto-detect') +\ No newline at end of file ++FFMPEG_BINARY = "ffmpeg" # by default it asks py-imageio to download ffmpeg from GitHub, but it doesn't exist there for FreeBSD, and it is also an insecure download ++ # instead, just default to "ffmpeg" which means to use the local binary ++IMAGEMAGICK_BINARY = os.getenv('IMAGEMAGICK_BINARY', 'auto-detect') Property changes on: head/multimedia/py-moviepy/files/patch-moviepy_config__defaults.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/py-moviepy/files/patch-moviepy_editor.py =================================================================== --- head/multimedia/py-moviepy/files/patch-moviepy_editor.py (nonexistent) +++ head/multimedia/py-moviepy/files/patch-moviepy_editor.py (revision 487621) @@ -0,0 +1,14 @@ +--- moviepy/editor.py.orig 2018-12-16 18:36:01 UTC ++++ moviepy/editor.py +@@ -21,8 +21,10 @@ import os + + # Downloads ffmpeg if it isn't already installed + import imageio ++from moviepy.config import get_setting ++ + # Checks to see if the user has set a place for their own version of ffmpeg +-if os.getenv('FFMPEG_BINARY', 'ffmpeg-imageio') == 'ffmpeg-imageio': ++if get_setting("FFMPEG_BINARY") == 'ffmpeg-imageio': + imageio.plugins.ffmpeg.download() + + # Clips Property changes on: head/multimedia/py-moviepy/files/patch-moviepy_editor.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property