Control: tags 1022472 + patch Control: tags 1022472 + pending Dear maintainer,
I've prepared an NMU for python-av (versioned as 9.2.0-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Also pushed to Salsa as the "nmu" branch: https://salsa.debian.org/debian/python-av/-/compare/debian%2Fmaster...nmu Regards, SR
diff -Nru python-av-9.2.0/debian/changelog python-av-9.2.0/debian/changelog --- python-av-9.2.0/debian/changelog 2022-08-16 16:13:13.000000000 +0200 +++ python-av-9.2.0/debian/changelog 2022-11-12 18:11:54.000000000 +0200 @@ -1,3 +1,10 @@ +python-av (9.2.0-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support setuptools >= 60. (Closes: #1022472) + + -- Stefano Rivera <stefa...@debian.org> Sat, 12 Nov 2022 18:11:54 +0200 + python-av (9.2.0-3) unstable; urgency=medium * add patch cherry-picked upstream diff -Nru python-av-9.2.0/debian/patches/series python-av-9.2.0/debian/patches/series --- python-av-9.2.0/debian/patches/series 2022-08-16 16:10:55.000000000 +0200 +++ python-av-9.2.0/debian/patches/series 2022-11-12 18:11:54.000000000 +0200 @@ -1,2 +1,3 @@ 020220311~1870465.patch 020220621~972f3ca.patch +setuptools-60.patch diff -Nru python-av-9.2.0/debian/patches/setuptools-60.patch python-av-9.2.0/debian/patches/setuptools-60.patch --- python-av-9.2.0/debian/patches/setuptools-60.patch 1970-01-01 02:00:00.000000000 +0200 +++ python-av-9.2.0/debian/patches/setuptools-60.patch 2022-11-12 18:11:54.000000000 +0200 @@ -0,0 +1,34 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sat, 12 Nov 2022 18:01:50 +0200 +Subject: Import setuptools before distutils + +setuptools 60 uses its own bundled version of distutils, by default. It +injects this into sys.modules, at import time. So we need to make sure +that it is imported, before anything else imports distutils, to ensure +everything is using the same distutils version. + +This change in setuptools is to prepare for Python 3.12, which will drop +distutils. + +Forwarded: https://github.com/PyAV-Org/PyAV/pull/1049 +Bug-Debian: https://bugs.debian.org/1022472 +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ec234f4..2d9da42 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,9 +7,10 @@ import shlex + import subprocess + import sys + ++from setuptools import Extension, find_packages, setup ++ + from Cython.Build import cythonize + from Cython.Compiler.AutoDocTransforms import EmbedSignature +-from setuptools import Extension, find_packages, setup + + + FFMPEG_LIBRARIES = [
