public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/ffmpeg-python/files/, dev-python/ffmpeg-python/
@ 2022-04-05 13:11 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2022-04-05 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     acf0097a0a026d935f073f9dfe82f1a43a3dac3e
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 20:39:45 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 12:31:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf0097a

dev-python/ffmpeg-python: new package; add version 0.2.0

Bug: https://github.com/deepjyoti30/ytmdl/issues/222
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-python/ffmpeg-python/Manifest                  |  1 +
 .../ffmpeg-python/ffmpeg-python-0.2.0.ebuild       | 38 ++++++++++++++++++++++
 .../ffmpeg-python-0.2.0-_run.py-collections.patch  | 12 +++++++
 ...fmpeg-python-0.2.0-setup.py-pytest-runner.patch | 11 +++++++
 dev-python/ffmpeg-python/metadata.xml              | 13 ++++++++
 5 files changed, 75 insertions(+)

diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
new file mode 100644
index 000000000000..c1f30ed46ffd
--- /dev/null
+++ b/dev-python/ffmpeg-python/Manifest
@@ -0,0 +1 @@
+DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301

diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
new file mode 100644
index 000000000000..4ee086b79602
--- /dev/null
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for FFmpeg with complex filtering support"
+HOMEPAGE="https://github.com/kkroening/ffmpeg-python"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
+else
+	SRC_URI="https://github.com/kkroening/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+"
+BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-_run.py-collections.patch
+	"${FILESDIR}"/${P}-setup.py-pytest-runner.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/src

diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
new file mode 100644
index 000000000000..6231ba17b86e
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
@@ -0,0 +1,12 @@
+index afc504d..bf43c06 100644
+--- a/ffmpeg/_run.py
++++ b/ffmpeg/_run.py
+@@ -137,7 +137,7 @@ def _get_output_args(node, stream_name_map):
+     if 'video_size' in kwargs:
+         video_size = kwargs.pop('video_size')
+         if not isinstance(video_size, basestring) and isinstance(
+-            video_size, collections.Iterable
++            video_size, collections.abc.Iterable
+         ):
+             video_size = '{}x{}'.format(video_size[0], video_size[1])
+         args += ['-video_size', video_size]

diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
new file mode 100644
index 000000000000..67fbb2308a37
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
@@ -0,0 +1,11 @@
+index 0282c67..2011d2c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -60,7 +60,6 @@ keywords = misc_keywords + file_formats
+ setup(
+     name='ffmpeg-python',
+     packages=['ffmpeg'],
+-    setup_requires=['pytest-runner'],
+     tests_require=['pytest', 'pytest-mock'],
+     version=version,
+     description='Python bindings for FFmpeg - with complex filtering support',

diff --git a/dev-python/ffmpeg-python/metadata.xml b/dev-python/ffmpeg-python/metadata.xml
new file mode 100644
index 000000000000..b908e7d7cbe1
--- /dev/null
+++ b/dev-python/ffmpeg-python/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kkroening/ffmpeg-python/issues/</bugs-to>
+    <remote-id type="github">kkroening/ffmpeg-python</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/ffmpeg-python/files/, dev-python/ffmpeg-python/
@ 2024-01-29 10:25 Michał Górny
  0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-01-29 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     f31a93d106e21a6ee2b63e72be4c0aeb06412b56
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 10:15:48 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 10:24:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31a93d1

dev-python/ffmpeg-python: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/ffmpeg-python/Manifest                  |  1 -
 .../ffmpeg-python/ffmpeg-python-0.2.0.ebuild       | 49 ----------------------
 .../ffmpeg-python-0.2.0-_run.py-collections.patch  | 12 ------
 ...fmpeg-python-0.2.0-setup.py-pytest-runner.patch | 11 -----
 4 files changed, 73 deletions(-)

diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
index de0664fc0583..04812b910f61 100644
--- a/dev-python/ffmpeg-python/Manifest
+++ b/dev-python/ffmpeg-python/Manifest
@@ -1,2 +1 @@
-DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301
 DIST ffmpeg-python-0.2.0_p20220711.gh.tar.gz 3286678 BLAKE2B f2dd4445f43ebf2a867d528e24e80b137ddc099770069e1fdf081b640f8ea192ee0b17c26d9ee3d8a69a9c7bbd61d0b75cc3468aa5da4fdd809e50126dff4e06 SHA512 81f20e5cad819500b941d9ac579fe01efb4292f61e6279c6d560d70c11143d7c04146a8ccf9ae8ab6985cf04e6b7cc05849ec67df646caa75764f3a2c5761cde

diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
deleted file mode 100644
index fd18cd92f295..000000000000
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for FFmpeg with complex filtering support"
-HOMEPAGE="https://github.com/kkroening/ffmpeg-python"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
-else
-	SRC_URI="https://github.com/kkroening/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-"
-BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-_run.py-collections.patch
-	"${FILESDIR}"/${P}-setup.py-pytest-runner.patch
-)
-
-EPYTEST_DESELECT=(
-	ffmpeg/tests/test_ffmpeg.py::test__get_filter_complex_input
-	ffmpeg/tests/test_ffmpeg.py::test__input__start_time
-	ffmpeg/tests/test_ffmpeg.py::test__multi_output_edge_label_order
-	ffmpeg/tests/test_ffmpeg.py::test__probe
-	ffmpeg/tests/test_ffmpeg.py::test__probe__extra_args
-	ffmpeg/tests/test_ffmpeg.py::test_fluent_complex_filter
-	ffmpeg/tests/test_ffmpeg.py::test_pipe
-	ffmpeg/tests/test_ffmpeg.py::test_repeated_args
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/src

diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
deleted file mode 100644
index 6231ba17b86e..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index afc504d..bf43c06 100644
---- a/ffmpeg/_run.py
-+++ b/ffmpeg/_run.py
-@@ -137,7 +137,7 @@ def _get_output_args(node, stream_name_map):
-     if 'video_size' in kwargs:
-         video_size = kwargs.pop('video_size')
-         if not isinstance(video_size, basestring) and isinstance(
--            video_size, collections.Iterable
-+            video_size, collections.abc.Iterable
-         ):
-             video_size = '{}x{}'.format(video_size[0], video_size[1])
-         args += ['-video_size', video_size]

diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
deleted file mode 100644
index 67fbb2308a37..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-index 0282c67..2011d2c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -60,7 +60,6 @@ keywords = misc_keywords + file_formats
- setup(
-     name='ffmpeg-python',
-     packages=['ffmpeg'],
--    setup_requires=['pytest-runner'],
-     tests_require=['pytest', 'pytest-mock'],
-     version=version,
-     description='Python bindings for FFmpeg - with complex filtering support',


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-01-29 10:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-29 10:25 [gentoo-commits] repo/gentoo:master commit in: dev-python/ffmpeg-python/files/, dev-python/ffmpeg-python/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2022-04-05 13:11 Maciej Barć

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox