[neon/qt6/qt6-multimedia/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy
Jonathan Esk-Riddell
null at kde.org
Tue Dec 6 13:31:47 GMT 2022
Git commit 01bed37295f695f68eae847c37b765269487531a by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.
revert to salsa experimental for qt 6.4.1 and run qt_sixy
A +1 -0 debian/.gitattributes
A +1 -0 debian/.gitignore
M +103 -3 debian/changelog
M +39 -13 debian/control
M +95 -18 debian/copyright
M +3 -0 debian/not-installed
M +54 -0 debian/qt6-multimedia-dev.install
M +2 -0 debian/qt6-multimedia.install
M +9 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-multimedia/commit/01bed37295f695f68eae847c37b765269487531a
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index 55e914f..9af392c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,108 @@
-qt6-multimedia (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-multimedia (6.4.1-1) experimental; urgency=medium
- * New release
+ [ Patrick Franz ]
+ * New upstream release 6.4.1 (Closes: #1012871).
+ * Bump Qt B-Ds to 6.4.1.
+ * Remove fix-build-on-unsupported-platforms.patch as it has been
+ applied upstream.
+ * Update symbols from buildlogs.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org> Thu, 17 Nov 2022 16:26:45 +0100
+
+qt6-multimedia (6.4.0-3) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015621).
+ * Fix FTCBFS, thx to Helmut Grohne: Pass -DQT_HOST_PATH (Closes:
+ #1023745).
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 13 Nov 2022 14:22:08 +0100
+
+qt6-multimedia (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+ * Add patch to fix build failure on i386.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 29 Oct 2022 13:51:54 +0200
+
+qt6-multimedia (6.4.0-1) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+ [ Patrick Franz ]
+ * Increase CMake verbosity level.
+
+ [ Lu YaNing ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Add libqt6spatialaudio6 package.
+ * Add symbols file.
+ * Update symbols.
+ * Update d/copyright.
+ * Add libqt6spatialaudio6 Depends.
+ * Update Descriptions.
+ * Modify the gstreamer plug-in library package location.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 22 Oct 2022 15:21:29 +0200
+
+qt6-multimedia (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:22:50 +0200
+
+qt6-multimedia (6.3.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.1).
+ * Bump Qt B-Ds to 6.3.1.
+ * Bump Standards-Version to 4.6.1 (no changes needed).
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 16:09:16 +0200
+
+qt6-multimedia (6.3.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.0).
+ * Bump Qt B-Ds to 6.3.0.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 15 Jun 2022 21:58:33 +0200
+
+qt6-multimedia (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:06:49 +0200
+
+qt6-multimedia (6.2.4-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 31 Mar 2022 00:20:26 +0200
+
+qt6-multimedia (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:41:20 +0100
+
+qt6-multimedia (6.2.2-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 27 Dec 2021 16:22:15 +0100
qt6-multimedia (6.2.2-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 8b5323c..8954a29 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,24 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libasound2-dev [linux-any],
libgl-dev,
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
+ libqt6shadertools6-dev (>= 6.4.1~),
libssl-dev,
libvulkan-dev [linux-any],
- libwayland-dev,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.3),
- qt6-declarative-dev (>= 6.2.3),
- qt6-shadertools-dev (>= 6.2.3),
- qt6-svg-dev (>= 6.2.3),
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
+ qt6-svg-dev (>= 6.4.1~),
xauth <!nocheck>,
xvfb <!nocheck>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-multimedia
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-multimedia.git
@@ -30,12 +29,9 @@ Rules-Requires-Root: no
Package: qt6-multimedia
Architecture: any
Section: kde
-Provides: libqt6multimedia6,
- libqt6multimediaquick6,
- libqt6multimediawidgets6,
- qml6-module-qtmultimedia
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qml6-module-qtquick, ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 Multimedia library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -46,7 +42,7 @@ Description: Qt 6 Multimedia library
Package: qt6-multimedia-dev
Architecture: any
Section: kde
-Provides: qt6-multimedia-dev
+X-Neon-MergedPackage: true
Depends: libglib2.0-dev,
qt6-base-dev,
qt6-multimedia (= ${binary:Version}),
@@ -57,3 +53,33 @@ Description: Qt 6 Multimedia - development files
.
This package contains the development files needed to build Qt applications
using Qt Multimedia libraries.
+
+Package: libqt6multimedia6
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6multimediaquick6
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6multimediawidgets6
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6spatialaudio6
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtmultimedia
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 0d782e1..3f29829 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,22 +3,22 @@ Upstream-Name: qtmultimedia-everywhere-src
Source: https://download.qt.io/archive/qt/*/submodules/
Files: *
-Copyright: 2016-2021 The Qt Company Ltd.
+Copyright: 2016-2022 The Qt Company Ltd.
2016 Research In Motion
2016 Jolla Ltd.
License: LGPL-3 or GPL-2
Files: debian/*
-Copyright: 2021 Patrick Franz <deltaone at debian.org>
- 2021 Lu YaNing <dluyaning at gmail.com>
+Copyright: 2021-2022 Patrick Franz <deltaone at debian.org>
+ 2022 Lu YaNing <dluyaning at gmail.com>
License: LGPL-3 or GPL-2
-Files: src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
- src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
- src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
- src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
+Files: src/plugins/multimedia/android/mediacapture/qandroidcamerasession.cpp
+ src/plugins/multimedia/android/mediacapture/qandroidcamerasession_p.h
+ src/plugins/multimedia/android/wrappers/jni/androidcamera.cpp
+ src/plugins/multimedia/android/wrappers/jni/androidcamera_p.h
Copyright: 2016 Ruslan Baratov
- 2016 The Qt Company Ltd.
+ 2016-2021 The Qt Company Ltd.
License: LGPL-3 or GPL-2
Files: src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
@@ -32,17 +32,18 @@ Files: src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
Copyright: 2016 Pelagicore AG
License: LGPL-3 or GPL-2
-Files: src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
- src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h
- src/multimedia/platform/qnx/mediaplayer/mmreventthread.cpp
- src/multimedia/platform/qnx/mediaplayer/mmreventthread_p.h
-Copyright: 2017 QNX Software Systems
-License: LGPL-3 or GPL-2
+Files: src/spatialaudio/*
+ src/spatialaudioquick3d/*
+ src/resonance-audio/resonance_audio.cpp
+ src/resonance-audio/resonance_audio.h
+Copyright: 2022 The Qt Company Ltd.
+License: LGPL-3
Files: conanfile.py
config.tests/*
tests/*
-Copyright: 2016-2021 The Qt Company Ltd.
+ util/adt_generate_qt.m
+Copyright: 2016-2022 The Qt Company Ltd.
License: GPL-3 with Qt-1.0 exception
Files: config.tests/mmrenderer/*
@@ -50,10 +51,8 @@ Copyright: 2016 BlackBerry Limited
License: GPL-3 with Qt-1.0 exception
Files: examples/*
- src/multimedia/doc/snippets/doc_src_qtmultimedia.cpp
src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
- src/multimediawidgets/doc/snippets/doc_src_qtmultimediawidgets.cpp
-Copyright: 2015-2021 The Qt Company Ltd.
+Copyright: 2015-2022 The Qt Company Ltd.
License: BSD-3-clause
Files: examples/multimedia/spectrum/3rdparty/fftreal/*
@@ -73,6 +72,63 @@ Files: *.qdoc
Copyright: 2015-2021 The Qt Company Ltd.
License: GFDL-NIV-1.3
+Files: src/3rdparty/eigen/*
+Copyright: eigen3 developers
+License: MPL-2.0
+
+Files: src/3rdparty/pffft/*
+Copyright: PFFFT developers
+License: custom-PFFFT
+ Copyright (c) 2013 Julien Pommier ( pommier at modartt.com )
+ .
+ Based on original fortran 77 code from FFTPACKv4 from NETLIB,
+ authored by Dr Paul Swarztrauber of NCAR, in 1985.
+ .
+ As confirmed by the NCAR fftpack software curators, the following
+ FFTPACKv5 license applies to FFTPACKv4 sources. My changes are
+ released under the same terms.
+ .
+ FFTPACK license:
+ .
+ http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
+ .
+ Copyright (c) 2004 the University Corporation for Atmospheric
+ Research ("UCAR"). All rights reserved. Developed by NCAR's
+ Computational and Information Systems Laboratory, UCAR,
+ www.cisl.ucar.edu.
+ .
+ Redistribution and use of the Software in source and binary forms,
+ with or without modification, is permitted provided that the
+ following conditions are met:
+ .
+ - Neither the names of NCAR's Computational and Information Systems
+ Laboratory, the University Corporation for Atmospheric Research,
+ nor the names of its sponsors or contributors may be used to
+ endorse or promote products derived from this Software without
+ specific prior written permission.
+ .
+ - Redistributions of source code must retain the above copyright
+ notices, this list of conditions, and the disclaimer below.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer below in the
+ documentation and/or other materials provided with the
+ distribution.
+ .
+ THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+ SOFTWARE.
+
+Files: src/3rdparty/resonance-audio/*
+Copyright: 2018 Google Inc.
+License: Apache-2.0
+
License: LGPL-2.1
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License version 2.1
@@ -183,3 +239,24 @@ License: GFDL-NIV-1.3
.
On Debian systems, the complete text of the GNU Free Documentation
License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
+
+License: MPL-2.0
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ .
+ On Debian systems, the complete text of Mozilla Public License 2.0 can
+ be found in /usr/share/common-licenses/MPL-2.0.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in /usr/share/common-licenses/Apache-2.0.
diff --git a/debian/not-installed b/debian/not-installed
index 8ee387a..bbbb503 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +1,7 @@
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/6.*
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/6.*
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfigVersion.cmake
@@ -15,6 +16,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaConfigVe
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaTargets-none.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6quickmultimediaTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6BundledResonanceAudio.a
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_multimedia_private.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_multimediaquick_private.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_multimediawidgets_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_spatialaudio_private.pri
diff --git a/debian/qt6-multimedia-dev.install b/debian/qt6-multimedia-dev.install
index 30142ec..cdb96e1 100644
--- a/debian/qt6-multimedia-dev.install
+++ b/debian/qt6-multimedia-dev.install
@@ -51,6 +51,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qmediatimerange.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qsoundeffect.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qtmultimedia-config.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qtmultimediadefs.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qtmultimediaexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qtmultimediaglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qtmultimediaversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qvideoframe.h
@@ -60,6 +61,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/qwavedecoder.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/QtMultimediaQuick
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/QtMultimediaQuickDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/QtMultimediaQuickVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/qtmultimediaquickexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/qtmultimediaquickversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/QGraphicsVideoItem
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/QVideoWidget
@@ -68,23 +70,59 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/QtMultimediaWidgetsDep
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/QtMultimediaWidgetsVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qgraphicsvideoitem.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qtmultimediawidgetdefs.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qtmultimediawidgetsexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qtmultimediawidgetsglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qtmultimediawidgetsversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/qvideowidget.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QAmbientSound
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QAudioEngine
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QAudioListener
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QAudioRoom
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QSpatialSound
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QtSpatialAudio
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QtSpatialAudioDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/QtSpatialAudioVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qambientsound.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qaudioengine.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qaudiolistener.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qaudioroom.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qspatialsound.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qtspatialaudioexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qtspatialaudioglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSpatialAudio/qtspatialaudioversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindAVFoundation.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindFFmpeg.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGObject.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGStreamer.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindMMRenderer.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindMMRendererCore.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindVAAPI.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindWMF.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindWrapBundledResonanceAudioConfigExtra.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindWrapPulseAudio.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtMultimediaTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledResonanceAudio/Qt6BundledResonanceAudioVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsConfigVersion.cmake
@@ -93,17 +131,33 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsDep
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Multimedia.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Multimedia.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaQuick.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaQuick.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaWidgets.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaWidgets.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6SpatialAudio.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6SpatialAudio.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6multimedia_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6multimediaquickprivate_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6multimediawidgets_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6spatialaudio_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Multimedia.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6MultimediaWidgets.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6SpatialAudio.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_multimedia.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_multimediawidgets.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_spatialaudio.pri
usr/share/qt6/modules/Multimedia.json
usr/share/qt6/modules/MultimediaQuickPrivate.json
usr/share/qt6/modules/MultimediaWidgets.json
+usr/share/qt6/modules/SpatialAudio.json
diff --git a/debian/qt6-multimedia.install b/debian/qt6-multimedia.install
index 8132730..a9f0733 100644
--- a/debian/qt6-multimedia.install
+++ b/debian/qt6-multimedia.install
@@ -1,6 +1,8 @@
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Multimedia.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaQuick.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6MultimediaWidgets.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6SpatialAudio.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/multimedia/libgstreamermediaplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtMultimedia/Video.qml
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtMultimedia/libquickmultimediaplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtMultimedia/plugins.qmltypes
diff --git a/debian/rules b/debian/rules
index 884c737..bfee6c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,21 @@
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ cmake_extra_args += -DQT_HOST_PATH=/usr
+endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(cmake_extra_args)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list