--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: ffmpeg: please make autopkgtests cross-test-friendly
- From: Steve Langasek <steve.langasek@canonical.com>
- Date: Thu, 05 Dec 2019 19:33:43 -0800
- Message-id: <157560322348.11673.10359320140702977062.reportbug@virgil.dodds.net>
Package: ffmpeg
Version: 7:4.2.1-2
Severity: minor
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Dear maintainers,
In Ubuntu, we are in the process of moving the i386 architecture to a
compatibility-only layer on amd64, and therefore we are also moving our
autopkgtest infrastructure to test i386 binaries in a cross-environment.
This requires changes to some tests so that they are cross-aware and can do
the right thing.
The ffmpeg tests currently fail in this environment, one because it is a
build test that does not invoke the toolchain in a cross-aware manner, and
another because it references a test dependency (libavcodec-extras) that
can't be installed as a foreign arch dependency.
I've verified that the attached patch lets the tests successfully build (and
run) i386 tests on an amd64 host.
Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment. Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option. So this change should be safe to land in your package despite this
not being upstream in autopkgtest.
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slangasek@ubuntu.com vorlon@debian.org
diff -Nru ffmpeg-4.2.1/debian/tests/control ffmpeg-4.2.1/debian/tests/control
--- ffmpeg-4.2.1/debian/tests/control 2019-11-01 18:17:31.000000000 -0700
+++ ffmpeg-4.2.1/debian/tests/control 2019-12-05 17:17:44.000000000 -0800
@@ -5,4 +5,4 @@
Depends: ffmpeg
Tests: encdec-extra
-Depends: ffmpeg, libavcodec-extra
+Depends: ffmpeg, libavcodec-extra58
diff -Nru ffmpeg-4.2.1/debian/tests/examples ffmpeg-4.2.1/debian/tests/examples
--- ffmpeg-4.2.1/debian/tests/examples 2019-11-01 18:17:31.000000000 -0700
+++ ffmpeg-4.2.1/debian/tests/examples 2019-12-05 17:29:02.000000000 -0800
@@ -10,6 +10,10 @@
cp -r /usr/share/doc/ffmpeg/examples ./
cd examples
+if [ -n "$DEB_HOST_MULTIARCH" ]; then
+ export CC="$DEB_HOST_GNU_TYPE-gcc"
+ export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig"
+fi
echo "building the examples..."
ret=0
make -k all 2>&1
--- End Message ---
--- Begin Message ---
Source: ffmpeg
Source-Version: 7:4.2.2-1
We believe that the bug you reported is fixed in the latest version of
ffmpeg, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 946241@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
James Cowgill <jcowgill@debian.org> (supplier of updated ffmpeg package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 25 Jan 2020 16:22:32 +0000
Source: ffmpeg
Architecture: source
Version: 7:4.2.2-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: James Cowgill <jcowgill@debian.org>
Closes: 944005 946241
Changes:
ffmpeg (7:4.2.2-1) unstable; urgency=medium
.
[ James Cowgill ]
* New upstream release.
.
* d/control:
- Change lib*-extra packages to arch any.
- Tighten dependencies from libav*-extra packages.
- Bump standards version to 4.5.0.
* d/rules: Enable opencl (Closes: #944005)
.
[ Steve Langasek ]
* d/tests: Make autopkgtests cross-test-friendly. (Closes: #946241)
Checksums-Sha1:
0ad898dd0bd12c6a5fa2b685225bfea981abfb04 5351 ffmpeg_4.2.2-1.dsc
2557ec7d1dee31169980a8a10404129f94bd5809 9094140 ffmpeg_4.2.2.orig.tar.xz
2b2f3167a64bc78f4b73f0e6519bf3d131f99cfe 473 ffmpeg_4.2.2.orig.tar.xz.asc
9853ee133d6c1cbd53386ffece07a68264c637fd 50784 ffmpeg_4.2.2-1.debian.tar.xz
Checksums-Sha256:
c99c523fa6a553df7d3bc0790443a5bfbc04f41983f918aa233bec48ed7070c3 5351 ffmpeg_4.2.2-1.dsc
cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c 9094140 ffmpeg_4.2.2.orig.tar.xz
8dcdc1d647a26397db4406d937d9e2917b57772131eeb2683ef78846da141c77 473 ffmpeg_4.2.2.orig.tar.xz.asc
b36470b31975f7b3a45273f756e472f280a82e73f231b9a5e3b938bb1349d561 50784 ffmpeg_4.2.2-1.debian.tar.xz
Files:
b8aac9cd32a52b8b0bf1998504ceb17a 5351 video optional ffmpeg_4.2.2-1.dsc
348956fc2faa57a2f79bbb84ded9fbc3 9094140 video optional ffmpeg_4.2.2.orig.tar.xz
fa73014a4165b71cafcdb7bc771e4882 473 video optional ffmpeg_4.2.2.orig.tar.xz.asc
1213f0f044b19d53e590534431555fb9 50784 video optional ffmpeg_4.2.2-1.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCgAyFiEE+Ixt5DaZ6POztUwQx/FnbeotAe8FAl4szawUHGpjb3dnaWxs
QGRlYmlhbi5vcmcACgkQx/FnbeotAe/ewg/+LPHa0BuR54CbwEYzSt1+7GhPmihR
8Yd3lO0eFwGfMQW5wNBr9/GBlUlXJWKirKxo+IjvCqxn5nMizpfEg2beaKtMrWNK
wIsLETUahxDUjOM6COXscly7RNM7V0DotZ8Xg71TmOk+8k4DFrSBimOcyzMD+OzW
w/otNkC3esip77fjB87bLsF64JjuJi7DrEqltQ3G22cNFLSWbc5RCR6XcNZ+Wl41
sYcH67fYQMbEKPkLc0kN/2FPXJonsJ7uJUX888FqyU9yfscHQvpVrUJZ8r9vVUzg
qxhq5QqZ/Hefn3hze4YYcy8ESk2ppnJPUvslZ+nZ/rMXmSBx449e6dm3maGAXVyo
aphHKCUHLzzcG6fY69FgAAT+/4B5gyzK8XkhAhImjtPHsyPpdMU3bGxpePVP1O1O
LCFV4snO15C2ojCR4OGM2bwTC70HrwTIuzkYE3dzqy4Qtne4lC2eglGNl6IqgPUN
yVV9Kb27T1sugBa8lPu0RyKwMxV6ESy/Hd7UxjAl53WT9JE6aUw0Xs/UaHFWsvHl
lxVLjdJ90FAJZeE2oGquAFGG3XJle4t9jYV8CSHYPEj37d4X9ErOOhtB667IdPZM
r0VXiFsO0+srJfgxHQ7G2Kn3RMguGM0QhDGAiSUyZnx3Y0CJ1Z7c1LoorLo5dDSm
SpRavQfBb1oEMaE=
=bjDF
-----END PGP SIGNATURE-----
--- End Message ---