From nobody Wed Nov 27 02:41:03 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XykG73kfPz5fPgt; Wed, 27 Nov 2024 02:41:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XykG728fcz4mqJ; Wed, 27 Nov 2024 02:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732675263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDfwJMSVjd0U4A5lQ8sOJsDWwtRMCd2ACPPbhMVyR2Q=; b=mSYFR9hGKNNKOpN5DTdE6ht+e0vdpivzK93VDjxiINmgLn5vpyQi0oaucVR1gAvFOowX/3 AnsWDLXkHuNT6v7Uy30kV425TgTuO5KJp68o4G9AUQ5chKp13/mKlWUxsPQIeS2nZjIxOG 2+hcLpF4cOcZLy8K9IukLss2dIRrwS6swuLk8kz8eyv7PMab1cw3jXIi+7cgfxHAziteux yVif236TSxt0DLDXOJ+6tvpYTnKfIPh05QjJFMqMpzh0srcucdkeO1bwkwJ2IZ18TNVZ/i tIwWQTKfOjAnMExQgVmnpf+lv0Iuq9pTAT92F/wdrYDeOrc68FBheiC2v+sHIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732675263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDfwJMSVjd0U4A5lQ8sOJsDWwtRMCd2ACPPbhMVyR2Q=; b=LowSX2YfPAAh+4KQlo5moBNWT2U7GuYkImbSvaFdanEa5sFcK4qcjCrKLiYu1QpflOpaZ2 rcL4muk3yp6NPnY9HUiRGBdOdmhGiNIzabmXjPkI2wGBr36Y/jvUBjvTMPbUnVCP6gyHKA u6DvLDw73LUDOrcmXRxRBYyoLj/jxr+9S0EE2ycMGrS+nLCQptEH7XtdR93IRkrUYMzmMZ qNec/YY3IF93I3ATQKhAxhICxaZS6225h8mumSnpiZPDCVVVyP6jBl/u1vU3cO7+b5S9en lUBcRcVwZcGBlZKB0F9kAyakoF3ReuraZ/OsTyvfEGHGe9vWR4KC152Dj4AlEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732675263; a=rsa-sha256; cv=none; b=aXbaikYrST0psvv7P+dt0XuBepoBRCGpQoj1DBlmPbutSFVvKREgzRb+0ODBmMJ6eMHG29 e1EvcFexsZPFv44m3A/MbQMIzNcrmqqNNBHr8l7M9caqO45s2LE3YLNtPn8wgoFf0y/S0/ xhOceTpvWsYFSW/CZckoYcYYCIWuIG/t7DrrC8oV6trZ4p0VAl6AKlmYPYoPRW+V4QO4SW AMLPxUWPiJjFzVDIwylsKagqMhlIkvOdrohvSz/KtGLGYbgJZWdcp3t8IzIkj5jdLAIroC C73OeAgf4QyPVFWE96vIJelt0OvHlmBI4l4J7LbQMAbakmuf/QhTbp44eTMIeA== 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 4XykG71hLWzr3m; Wed, 27 Nov 2024 02:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AR2f3vC019553; Wed, 27 Nov 2024 02:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AR2f312019550; Wed, 27 Nov 2024 02:41:03 GMT (envelope-from git) Date: Wed, 27 Nov 2024 02:41:03 GMT Message-Id: <202411270241.4AR2f312019550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 30574242425f - main - multimedia/py-moviepy: Update to 2.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30574242425f76a7ccff54a23aa47488580687c9 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=30574242425f76a7ccff54a23aa47488580687c9 commit 30574242425f76a7ccff54a23aa47488580687c9 Author: Po-Chuan Hsieh AuthorDate: 2024-11-27 02:34:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-11-27 02:34:31 +0000 multimedia/py-moviepy: Update to 2.0.0 - Update WWW Changes: https://github.com/Zulko/moviepy/releases --- multimedia/py-moviepy/Makefile | 16 ++++----- multimedia/py-moviepy/distinfo | 6 ++-- .../py-moviepy/files/patch-moviepy-config.py | 11 ++++++ .../files/patch-moviepy-config_defaults.py | 10 ------ .../py-moviepy/files/patch-moviepy-decorators.py | 40 ---------------------- .../py-moviepy/files/patch-moviepy-editor.py | 21 ------------ multimedia/py-moviepy/files/patch-pyproject.toml | 18 ++++++++++ multimedia/py-moviepy/files/patch-setup.py | 13 ------- 8 files changed, 40 insertions(+), 95 deletions(-) diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index da95aabf00f2..83ee206f213e 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -1,27 +1,27 @@ PORTNAME= moviepy -PORTVERSION= 1.0.3 -PORTREVISION= 6 +PORTVERSION= 2.0.0 CATEGORIES= multimedia python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Video editing with Python -WWW= https://github.com/Zulko/moviepy +WWW= https://zulko.github.io/moviepy/ \ + https://github.com/Zulko/moviepy LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<6.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} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}proglog<=1.0.0:devel/py-proglog@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.8.1<3.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2<5.0:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.25.0,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}proglog>0<1.0.0_99:devel/py-proglog@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.10:www/py-python-dotenv@${PY_FLAVOR} USES= magick:run python USE_PYTHON= autoplist concurrent pep517 diff --git a/multimedia/py-moviepy/distinfo b/multimedia/py-moviepy/distinfo index 91ad2b02b4b4..a265cc63ca22 100644 --- a/multimedia/py-moviepy/distinfo +++ b/multimedia/py-moviepy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588930331 -SHA256 (moviepy-1.0.3.tar.gz) = 2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5 -SIZE (moviepy-1.0.3.tar.gz) = 388311 +TIMESTAMP = 1732260952 +SHA256 (moviepy-2.0.0.tar.gz) = 3affb0343626f026c11e7a8e42c9b2fbb5b2253e5c8988cb7930c1bd9b0d7c93 +SIZE (moviepy-2.0.0.tar.gz) = 58420021 diff --git a/multimedia/py-moviepy/files/patch-moviepy-config.py b/multimedia/py-moviepy/files/patch-moviepy-config.py new file mode 100644 index 000000000000..523817869903 --- /dev/null +++ b/multimedia/py-moviepy/files/patch-moviepy-config.py @@ -0,0 +1,11 @@ +--- moviepy/config.py.orig 2024-11-20 05:20:50 UTC ++++ moviepy/config.py +@@ -15,7 +15,7 @@ except ImportError: + except ImportError: + DOTENV = None + +-FFMPEG_BINARY = os.getenv("FFMPEG_BINARY", "ffmpeg-imageio") ++FFMPEG_BINARY = os.getenv("FFMPEG_BINARY", "ffmpeg") + FFPLAY_BINARY = os.getenv("FFPLAY_BINARY", "auto-detect") + + IS_POSIX_OS = os.name == "posix" diff --git a/multimedia/py-moviepy/files/patch-moviepy-config_defaults.py b/multimedia/py-moviepy/files/patch-moviepy-config_defaults.py deleted file mode 100644 index 6d87021c5abc..000000000000 --- a/multimedia/py-moviepy/files/patch-moviepy-config_defaults.py +++ /dev/null @@ -1,10 +0,0 @@ ---- moviepy/config_defaults.py.orig 2019-10-01 15:30:18 UTC -+++ moviepy/config_defaults.py -@@ -50,5 +50,6 @@ IMAGEMAGICK_BINARY - - import os - --FFMPEG_BINARY = os.getenv('FFMPEG_BINARY', 'ffmpeg-imageio') -+# Use ffmpeg from ports -+FFMPEG_BINARY = "ffmpeg" - IMAGEMAGICK_BINARY = os.getenv('IMAGEMAGICK_BINARY', 'auto-detect') diff --git a/multimedia/py-moviepy/files/patch-moviepy-decorators.py b/multimedia/py-moviepy/files/patch-moviepy-decorators.py deleted file mode 100644 index 704200024c63..000000000000 --- a/multimedia/py-moviepy/files/patch-moviepy-decorators.py +++ /dev/null @@ -1,40 +0,0 @@ -Obtained from: https://github.com/Zulko/moviepy/commit/2947e4a036513a264de3fc5234160e71d1b06aed - ---- moviepy/decorators.py.orig 2020-05-07 15:34:11 UTC -+++ moviepy/decorators.py -@@ -3,6 +3,7 @@ all decorators used in moviepy go there - """ - - import decorator -+import inspect - - from moviepy.tools import cvsecs - -@@ -76,12 +77,7 @@ def preprocess_args(fun,varnames): - """ Applies fun to variables in varnames before launching the function """ - - def wrapper(f, *a, **kw): -- if hasattr(f, "func_code"): -- func_code = f.func_code # Python 2 -- else: -- func_code = f.__code__ # Python 3 -- -- names = func_code.co_varnames -+ names = inspect.getfullargspec(func).args - new_a = [fun(arg) if (name in varnames) else arg - for (arg, name) in zip(a, names)] - new_kw = {k: fun(v) if k in varnames else v -@@ -120,12 +116,7 @@ def use_clip_fps_by_default(f, clip, *a, **k): - " the clip's fps with `clip.fps=24`" % f.__name__) - - -- if hasattr(f, "func_code"): -- func_code = f.func_code # Python 2 -- else: -- func_code = f.__code__ # Python 3 -- -- names = func_code.co_varnames[1:] -+ names = inspect.getfullargspec(func).args[1:] - - new_a = [fun(arg) if (name=='fps') else arg - for (arg, name) in zip(a, names)] diff --git a/multimedia/py-moviepy/files/patch-moviepy-editor.py b/multimedia/py-moviepy/files/patch-moviepy-editor.py deleted file mode 100644 index 15aa502d134b..000000000000 --- a/multimedia/py-moviepy/files/patch-moviepy-editor.py +++ /dev/null @@ -1,21 +0,0 @@ ---- moviepy/editor.py.orig 2020-03-24 20:20:06 UTC -+++ moviepy/editor.py -@@ -20,18 +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') is None: -- if sys.version_info < (3, 4): -- #uses an old version of imageio with ffmpeg.download. -- imageio.plugins.ffmpeg.download() -- --# Hide the welcome message from pygame: https://github.com/pygame/pygame/issues/542 --os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = "1" -- - # Clips - from .video.io.VideoFileClip import VideoFileClip - from .video.io.ImageSequenceClip import ImageSequenceClip diff --git a/multimedia/py-moviepy/files/patch-pyproject.toml b/multimedia/py-moviepy/files/patch-pyproject.toml new file mode 100644 index 000000000000..fe7c96e9bbde --- /dev/null +++ b/multimedia/py-moviepy/files/patch-pyproject.toml @@ -0,0 +1,18 @@ +--- pyproject.toml.orig 2024-11-20 05:20:50 UTC ++++ pyproject.toml +@@ -33,7 +33,7 @@ dependencies = [ + "numpy>=1.25.0", + "proglog<=1.0.0", + "python-dotenv>=0.10", +- "pillow>=9.2.0,<11.0", ++ "pillow>=9.2.0", + ] + + [project.optional-dependencies] +@@ -61,4 +61,4 @@ include = ["moviepy*"] + + [tool.setuptools.packages.find] + include = ["moviepy*"] +-exclude = ["media", "tests", "docs"] +\ No newline at end of file ++exclude = ["media", "tests", "docs"] diff --git a/multimedia/py-moviepy/files/patch-setup.py b/multimedia/py-moviepy/files/patch-setup.py deleted file mode 100644 index 93e255c52291..000000000000 --- a/multimedia/py-moviepy/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ -Obtained from: https://github.com/Zulko/moviepy/commit/2947e4a036513a264de3fc5234160e71d1b06aed - ---- setup.py.orig 2020-05-07 15:34:11 UTC -+++ setup.py -@@ -62,7 +62,7 @@ exec(open('moviepy/version.py').read()) # loads __vers - - # Define the requirements for specific execution needs. - requires = [ -- 'decorator>=4.0.2,<5.0', -+ 'decorator>=4.0.2,<6.0', - "imageio>=2.5,<3.0; python_version>='3.4'", - "imageio>=2.0,<2.5; python_version<'3.4'", - "imageio_ffmpeg>=0.2.0; python_version>='3.4'",