[Pkg-privacy-maintainers] Bug#993209: mat2: autopkgtests fail with libimage-exiftool-perl >= 12.23

[gregor herrmann]

Package: mat2
Version: 0.12.1-3
Severity: serious
Tags: upstream sid bookworm fixed-upstream patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

mat2's autopkgtests fail with newer libimage-exiftool-perl:

https://ci.debian.net/data/autopkgtest/testing/amd64/m/mat2/14885837/log.gz

>               self.assertEqual(v, case['expected_meta'][k])
E               AssertionError: 'MP4 Base Media v1 [IS0 14496-12:2003]' != 'MP4  Base Media v1 [IS0 14496-12:2003]'
E               - MP4 Base Media v1 [IS0 14496-12:2003]
E               + MP4  Base Media v1 [IS0 14496-12:2003]
E               ?    +


This is caused by a typo fix in lib/Image/ExifTool/QuickTime.pm in
12.23:

- -    'isom' => 'MP4  Base Media v1 [IS0 14496-12:2003]', # video/mp4
+    'isom' => 'MP4 Base Media v1 [IS0 14496-12:2003]', # video/mp4 (or audio)


In mat2 there's this test for the "old" version of the string:

% grep -ri "mp4  base media"               
tests/test_libmat2.py:                'MajorBrand': 'MP4  Base Media v1 [IS0 14496-12:2003]',


Apparently this is already fixed in upstream git:
https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977


I'm attaching a slightly rebased quilt patch based on this commit.

(After this we still see a test failure during build and in
autopkgtests, but this is #992912 / 
https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578
)


Cheers,
gregor

-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEE0eExbpOnYKgQTYX6uzpoAYZJqgYFAmEqWXJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQx
RTEzMTZFOTNBNzYwQTgxMDREODVGQUJCM0E2ODAxODY0OUFBMDYACgkQuzpoAYZJ
qgZ8Zg//VTv9wNcLrnV+vHZ0jVYaOVHZpJZzhc4XZbJKJxC5U6kWDZp4drTMR+tf
PXWYUlR4X+eklzQs5n+kZQiFNqZ+A6mgWzjCc6p7wkpfQcnZgjrGNFHLdWlZ++pg
hobTKm2rSXoo1zf3AlJpf2i8/6hWouDGSiLtR4se3YHDtH2HfVzhvGwOR/Z1JuCD
OG1Zxq/1j8CHEHX0Az/rL3hGUfWKo0G6P4y2yqlH7UeL0gfE+EDhCUGLkYjeFYqq
WasWosXTm5xO3vqNsf/8l1bpIbk7bUXsoBHO5FMs27vDBQ2VokYkPVLabLnXT+wY
2LcQkVjsAEZN9PkOfGpeNLQ1JiKHWlbwFqZ/VHoT+n1377DZj+Gcs3FzghwN9Hqd
vaQ5EXj9c3R7wCqGN+Ct92hKbdPTnsqX1UmM/FbkfOcMW5Xy9itTzZYMYnYsOeJv
iU5EyHrJNODcSzolPeJnn3fr3X69k1zD9Tf55oAVofP5xXAqPNU0RCN0B7gKK6nI
KDACC1I75noGvpFmoEkZAc3TxlZJyMTzMKoyDeXNWQjIt2gNwIUFaGz7xYIJyGp1
GNxHkPL98fiiTo3Y5nITEraekD4Gj3B8BFUelhdmssCVl2GO23KR5Bmq3fd6CtrS
hZdE4rz+dnBG3BWoMyao2lWZJ3yY/dU0+jI8CUc/R6zKJF70XMk=
=ROMt
-----END PGP SIGNATURE-----
-------------- next part --------------
>From 6df615281b2a649b85ff7670f6d87d3beed0b977 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin at dustri.org>
Date: Sun, 6 Jun 2021 16:25:59 +0200
Subject: [PATCH] Fix the CI for recent exiftool versions

Always a joy to deal with withespaces
---
 tests/test_libmat2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/tests/test_libmat2.py
+++ b/tests/test_libmat2.py
@@ -448,7 +448,7 @@
                 'HandlerDescription': 'SoundHandler',
                 'HandlerType': 'Metadata',
                 'HandlerVendorID': 'Apple',
-                'MajorBrand': 'MP4  Base Media v1 [IS0 14496-12:2003]',
+                'MajorBrand': 'Base Media v1 [IS0 14496-12:2003]',
                 'MediaDataOffset': 48,
                 'MediaDataSize': 379872,
                 'MediaHeaderVersion': 0,
@@ -502,7 +502,7 @@
             p2 = case['parser'](p1.output_filename)
             for k, v in p2.get_meta().items():
                 self.assertIn(k, case['expected_meta'])
-                self.assertEqual(v, case['expected_meta'][k])
+                self.assertIn(str(case['expected_meta'][k]), str(v))
             self.assertTrue(p2.remove_all())
 
             os.remove(target)