Bug 272736 - multimedia/qt6-multimedia: Fix pkg-plist for ALSA, PULSEAUDIO option.
Summary: multimedia/qt6-multimedia: Fix pkg-plist for ALSA, PULSEAUDIO option.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Jan Beich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-07-26 15:34 UTC by Florian Walpen
Modified: 2023-07-27 18:08 UTC (History)
1 user (show)

See Also:


Attachments
Fix pkg-plist for ALSA, PULSEAUDIO option. (2.97 KB, patch)
2023-07-26 15:34 UTC, Florian Walpen
dev: maintainer-approval? (kde)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Walpen 2023-07-26 15:34:30 UTC
Created attachment 243629 [details]
Fix pkg-plist for ALSA, PULSEAUDIO  option.

Since the update to Qt 6.5.1, package stage is broken when PULSEAUDIO is off. Make the pulseaudio headers in pkg-plist depend on PULSEAUDIO option, and add the missing entries for ALSA.
Comment 1 Florian Walpen 2023-07-26 16:15:07 UTC
BTW, in my test builds poudriere complained about the following missing dependencies:

Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libX11.so.6
from x11/libX11 but it is not declared as a dependency
Warning: you need USE_XORG+=x11
Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXrandr.so
.2 from x11/libXrandr but it is not declared as a dependency
Warning: you need USE_XORG+=xrandr
Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXext.so.6
 from x11/libXext but it is not declared as a dependency
Warning: you need USE_XORG+=xext

These are not included in my patch.
Comment 2 commit-hook freebsd_committer freebsd_triage 2023-07-27 17:59:07 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=68e81b3745a4cf35674daad7f999f6b0896d5b9f

commit 68e81b3745a4cf35674daad7f999f6b0896d5b9f
Author:     Florian Walpen <dev@submerge.ch>
AuthorDate: 2023-07-26 15:21:41 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-27 17:57:43 +0000

    multimedia/qt6-multimedia: unbreak ALSA=on PULSEAUDIO=off after 230148d80ee0

    ===> Checking for items in STAGEDIR missing from pkg-plist
    Error: Orphaned: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiodevice_p.h
    Error: Orphaned: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosink_p.h
    Error: Orphaned: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosource_p.h
    Error: Orphaned: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsamediadevices_p.h
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiodevice_p.h
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiomediadevices_p.h
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiosink_p.h
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiosource_p.h
    Error: Missing: %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulsehelpers_p.h
    ===> Error: Plist issues found.
    *** Error code 1

    PR:             272736

 multimedia/qt6-multimedia/pkg-plist | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-07-27 17:59:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5b77a1e28d483d01e8c137441c4fe697ec6b5f24

commit 5b77a1e28d483d01e8c137441c4fe697ec6b5f24
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-27 17:43:32 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-27 17:57:43 +0000

    multimedia/qt6-multimedia: track X11 dependencies after 230148d80ee0

    ====> Running Q/A tests (stage-qa)
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency
    Warning: you need USE_XORG+=x11
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXrandr.so.2 from x11/libXrandr but it is not declared as a dependency
    Warning: you need USE_XORG+=xrandr
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXext.so.6 from x11/libXext but it is not declared as a dependency
    Warning: you need USE_XORG+=xext

    PR:             272736
    Reported by:    Florian Walpen
    Regressed by:   https://codereview.qt-project.org/c/qt/qtmultimedia/+/459506

 multimedia/qt6-multimedia/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-07-27 18:07:10 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dba1abfea74db156825797457e0df5c2aa5e7348

commit dba1abfea74db156825797457e0df5c2aa5e7348
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-27 18:01:54 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-27 18:06:49 +0000

    multimedia/qt6-multimedia: restore non-ALSA file after 68e81b3745a4

    $ fgrep -rl qaudiodevice_p.h /usr/local/include
    /usr/local/include/qt6/QtMultimedia/6.5.1/QtMultimedia/private/qpulseaudiodevice_p.h

    PR:             272736

 multimedia/qt6-multimedia/Makefile  | 2 +-
 multimedia/qt6-multimedia/pkg-plist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Comment 5 Jan Beich freebsd_committer freebsd_triage 2023-07-27 18:08:50 UTC
Thanks. Landed under portmgr blanket.