Skip to content

fix(qt6-qtmultimedia): remove leftover GStreamer media plugin devel f… #17782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WithEnoughCoffee wants to merge 1 commit into
base: 4.0
Choose a base branch
from
+22 −7
Open

fix(qt6-qtmultimedia): remove leftover GStreamer media plugin devel f… #17782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions base/comps/qt6-qtmultimedia/qt6-qtmultimedia.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,18 @@ type = "spec-search-replace"
section = "%files"
regex = '^%\{_qt6_plugindir\}/multimedia/libgstreamermediaplugin\.so$'
replacement = ''

# Dropping the gstreamer-plugins-bad BR also stops the GStreamer media plugin
# devel artifacts (QtGstreamerMediaPluginImpl headers/.a/.prl/cmake) from being
# built. The runtime %files entries were removed above, but the matching
# %files devel entries were missed, so qt6-qtmultimedia-devel packaging fails
# with "File/Directory not found". A single line-based regex drops every devel
# %files entry that references QtGstreamerMediaPluginImpl (headers, .a, .prl,
# the cmake %dir, and the cmake glob).
[[components.qt6-qtmultimedia.overlays]]
description = "Remove all QtGstreamerMediaPluginImpl devel %files entries (not built without gstreamer-plugins-bad)"
type = "spec-search-replace"
section = "%files"
package = "devel"
regex = '^.*GstreamerMediaPluginImpl.*$'
replacement = ''
2 changes: 1 addition & 1 deletion locks/qt6-qtmultimedia.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '66b4dd09782f23900e04dc2a93470c6ef8a02537'
upstream-commit = '66b4dd09782f23900e04dc2a93470c6ef8a02537'
input-fingerprint = 'sha256:796992d13039bed1d8a28f20772baec8dcbb76e0f433968e82c6767aabb56d2e'
input-fingerprint = 'sha256:7912965e3b6ac8f0339d2f8e6ceff4805e727df0bcf72dd305691ae15153f20a'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
12 changes: 6 additions & 6 deletions specs/q/qt6-qtmultimedia/qt6-qtmultimedia.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Summary: Qt6 - Multimedia support
Name: qt6-%{qt_module}
Version: 6.10.2
Release: 4%{?dist}
Release: 5%{?dist}

License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
Expand Down Expand Up @@ -170,7 +170,7 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%if %{with ffmpeg}
%{_qt6_headerdir}/QtFFmpegMediaPluginImpl/
%endif
%{_qt6_headerdir}/QtGstreamerMediaPluginImpl/

%{_qt6_headerdir}/QtMultimedia/
%{_qt6_headerdir}/QtMultimediaTestLib/
%{_qt6_headerdir}/QtMultimediaQuick/
Expand All @@ -182,8 +182,8 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%{_qt6_libdir}/libQt6FFmpegMediaPluginImpl.a
%{_qt6_libdir}/libQt6FFmpegMediaPluginImpl.prl
%endif
%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.a
%{_qt6_libdir}/libQt6GstreamerMediaPluginImpl.prl


%{_qt6_libdir}/libQt6Multimedia.so
%{_qt6_libdir}/libQt6Multimedia.prl
%{_qt6_libdir}/libQt6MultimediaTestLib.a
Expand All @@ -201,7 +201,7 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%if %{with ffmpeg}
%dir %{_qt6_libdir}/cmake/Qt6FFmpegMediaPluginImplPrivate
%endif
%dir %{_qt6_libdir}/cmake/Qt6GstreamerMediaPluginImplPrivate

%dir %{_qt6_libdir}/cmake/Qt6Multimedia
%dir %{_qt6_libdir}/cmake/Qt6MultimediaPrivate
%dir %{_qt6_libdir}/cmake/Qt6MultimediaTestLibPrivate/
Expand All @@ -217,7 +217,7 @@ rm -r %{buildroot}%{_qt6_archdatadir}/mkspecs/features/ios/add_ios_ffmpeg_librar
%if %{with ffmpeg}
%{_qt6_libdir}/cmake/Qt6FFmpegMediaPluginImplPrivate/*.cmake
%endif
%{_qt6_libdir}/cmake/Qt6GstreamerMediaPluginImplPrivate/*.cmake

%{_qt6_libdir}/cmake/Qt6Multimedia/*.cmake
%{_qt6_libdir}/cmake/Qt6MultimediaPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake
Expand Down
Loading