1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Sunpoet Po-Chuan Hsieh 2019-02-16 22:54:17 +00:00
parent e609a7cbb9
commit eaf69e1666
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=493113
6 changed files with 46 additions and 33 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= moviepy
PORTVERSION= 0.2.3.5
PORTREVISION= 2
PORTVERSION= 1.0.0
CATEGORIES= multimedia python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -15,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.txt
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \
${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}proglog<=1.0.0:devel/py-proglog@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.8.1:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2:misc/py-tqdm@${PY_FLAVOR} \
USES= python
@ -32,4 +32,13 @@ IMAGEMAGICK7_DESC= Use ImageMagick 7.x as backend
IMAGEMAGICK6_RUN_DEPENDS= convert:graphics/ImageMagick6
IMAGEMAGICK7_RUN_DEPENDS= convert:graphics/ImageMagick7
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} >= 3400
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}imageio>=2.5:graphics/py-imageio@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR}
.else
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}imageio24>=2.0:graphics/py-imageio24@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1527884501
SHA256 (moviepy-0.2.3.5.tar.gz) = 536ea61c2c7d276ee65daf2da8a1d2e34bbafd524d6e8a20fde38ce9bfbd2dcb
SIZE (moviepy-0.2.3.5.tar.gz) = 372996
TIMESTAMP = 1550245347
SHA256 (moviepy-1.0.0.tar.gz) = 16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d
SIZE (moviepy-1.0.0.tar.gz) = 398839

View File

@ -0,0 +1,12 @@
--- moviepy/config_defaults.py.orig 2018-12-15 16:06:35 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
+# Use ffmpeg from ports
+FFMPEG_BINARY = "ffmpeg"
+IMAGEMAGICK_BINARY = os.getenv('IMAGEMAGICK_BINARY', 'auto-detect')

View File

@ -0,0 +1,18 @@
--- moviepy/editor.py.orig 2019-02-14 01:02:48 UTC
+++ moviepy/editor.py
@@ -20,15 +20,6 @@ clip.preview().
import os
import sys
-# Downloads ffmpeg if it isn't already installed
-import imageio
-# 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 sys.version_info < (3, 4):
- #uses an old version of imageio with ffmpeg.download.
- imageio.plugins.ffmpeg.download()
-
# Clips
from .video.io.VideoFileClip import VideoFileClip
from .video.io.ImageSequenceClip import ImageSequenceClip

View File

@ -1,12 +0,0 @@
--- 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')

View File

@ -1,14 +0,0 @@
--- 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