[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.17.2+dfsg

[Dmitry Shachnev]

Git commit 3d481df05b4dce1b6169a1c0cd11c4b6e9b6edb9 by Dmitry Shachnev.
Committed on 29/01/2025 at 19:27.
Pushed by carlosdem into branch 'Neon/release'.

New upstream version 1.17.2+dfsg

M  +1    -1    docs/conf.py
M  +10   -0    docs/releases.md
M  +2    -2    pyqtbuild/builder.py
M  +9    -0    pyqtbuild/bundle/packages/pyqt6.py

https://invent.kde.org/neon/forks/pyqt-builder/-/commit/3d481df05b4dce1b6169a1c0cd11c4b6e9b6edb9

diff --git a/docs/conf.py b/docs/conf.py
index fd1ff31..f9af9d3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,7 @@ project = 'PyQt-builder'
 copyright = '{0} Phil Thompson <phil at riverbankcomputing.com>'.format(
         date.today().year)
 author = 'Phil Thompson'
-version = 'v1.17.1'
+version = 'v1.17.2'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/releases.md b/docs/releases.md
index f4141e9..7dde761 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1,6 +1,16 @@
 # Release Notes
 
 
+## v1.17.2
+
+### Missing Linux multimedia libraries in Qt v6.8
+
+In Qt v6.8 the QtMultimedia ffmpeg Linux backend depends on new libraries
+that were not included in the Qt wheels.
+
+Resolves [#29](https://github.com/Python-PyQt/PyQt-builder/issues/29)
+
+
 ## v1.17.1
 
 ### Updated the default ABIs used
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index e7c76db..bc65517 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -132,8 +132,8 @@ class QmakeBuilder(Builder):
 
             # Set the default ABI major version of the sip module.  These
             # should track the versions specified by the latest versions of
-            # PyQt5 and PyQt6 (and vice versa).  In future this can be removed
-            # completely.
+            # PyQt5 and PyQt6 (and vice versa).  This can be removed completely
+            # when PyQt5 and PyQt6 use %MinimumABIVersion unconditionaly.
             if not project.abi_version:
                 if project.sip_module == 'PyQt5.sip':
                     project.abi_version = '12.15'
diff --git a/pyqtbuild/bundle/packages/pyqt6.py b/pyqtbuild/bundle/packages/pyqt6.py
index 4525a0b..c44c721 100644
--- a/pyqtbuild/bundle/packages/pyqt6.py
+++ b/pyqtbuild/bundle/packages/pyqt6.py
@@ -69,6 +69,15 @@ _QT_METADATA = {
         VersionedMetadata(version=(6, 8, 0),
                 lib_deps={'': ('QtMultimediaQuick', )},
                 other_lib_deps={
+                    'linux': (
+                            'libQt6FFmpegStub-crypto.so.3',
+                            'libQt6FFmpegStub-ssl.so.3',
+                            'libQt6FFmpegStub-va.so.2',
+                            'libQt6FFmpegStub-va-drm.so.2',
+                            'libQt6FFmpegStub-va-x11.so.2',
+                            'libavcodec.so.61', 'libavformat.so.61',
+                            'libavutil.so.59', 'libswresample.so.5',
+                            'libswscale.so.8'),
                     'macos': ('libavcodec.61.dylib', 'libavformat.61.dylib',
                             'libavutil.59.dylib', 'libswresample.5.dylib',
                             'libswscale.8.dylib'),