Skip to content

Commit

Permalink
framework: move 'phonon4' from qt.mk to kde.mk as 'phonon'
Browse files Browse the repository at this point in the history
To depend on phonon, you now need

USES=	kde:<ver>
USE_KDE=phonon

if you want to depend on the backend, also add

USE_KDE=	phonon-backend
  • Loading branch information
tcberner committed Dec 3, 2023
1 parent 067a184 commit b2a438e
Show file tree
Hide file tree
Showing 51 changed files with 111 additions and 101 deletions.
14 changes: 12 additions & 2 deletions Mk/Uses/kde.mk
Expand Up @@ -342,18 +342,22 @@ _USE_KDEPIM5_ALL= akonadicontacts akonadiimportwizard akonadimime akonadinotes \
kalarm kmail-account-wizard kmail knotes kontact \
korganizer pim-data-exporter ktextaddons

_USE_PHONON_ALL= phonon phonon-backend

_USE_KDE5_ALL= ${_USE_FRAMEWORKS_ALL} \
${_USE_PLASMA_ALL} \
${_USE_KDEPIM5_ALL} \
${_USE_KDE_BOTH}
${_USE_KDE_BOTH} \
${_USE_PHONON_ALL}
# TODO: fix
_USE_KDE6_ALL= ecm colorscheme \
svg \
plasma-wayland-protocols \
mediaplayer \
${_USE_FRAMEWORKS_ALL} \
${_USE_PLASMA_ALL} \
plasma5support activities activities-stats kpipewire wayland globalacceld libplasma
plasma5support activities activities-stats kpipewire wayland globalacceld libplasma \
${_USE_PHONON_ALL}

# ====================== frameworks components =================================
kde-activities_PORT5= x11/kf${_KDE_VERSION}-kactivities
Expand Down Expand Up @@ -987,6 +991,12 @@ kde-kosm_LIB= libKOSM.so

kde-okular5_PORT= graphics/okular
kde-okular5_LIB= libOkular5Core.so

kde-phonon_PORT= multimedia/phonon@${_QT_RELNAME}
kde-phonon_LIB= libphonon4${_QT_RELNAME}.so

kde-phonon-backend_PORT= multimedia/phonon-vlc@${_QT_RELNAME}
kde-phonon-backend_PATH= ${QT_PLUGINDIR}/phonon4${_QT_RELNAME}_backend/phonon_vlc_${_QT_RELNAME}.so
# ====================== end of multiversion components ========================

# ====================== select the proper multiversion component ==============
Expand Down
5 changes: 1 addition & 4 deletions Mk/Uses/qt.mk
Expand Up @@ -143,7 +143,7 @@ _QT_MK_POST_INCLUDED= qt.mk

# The Qt components supported by qt.mk: list of shared, and version specific ones
_USE_QT_COMMON= 3d charts connectivity datavis3d declarative doc examples imageformats location \
multimedia networkauth phonon4 quick3d quicktimeline remoteobjects scxml \
multimedia networkauth quick3d quicktimeline remoteobjects scxml \
sensors serialbus serialport speech svg virtualkeyboard wayland \
webchannel webengine websockets webview

Expand Down Expand Up @@ -280,9 +280,6 @@ qt-pdf_LIB= libQt${_QT_LIBVER}Pdf.so
qt-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool
qt-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool

qt-phonon4_PORT= multimedia/phonon@${_QT_RELNAME}
qt-phonon4_LIB= libphonon4${_QT_RELNAME}.so

qt-positioning_PORT= devel/${_QT_RELNAME}-positioning
qt-positioning_LIB= libQt${_QT_LIBVER}Positioning.so

Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmousetool/Makefile
Expand Up @@ -10,9 +10,9 @@ LICENSE= GPLv2

USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
i18n iconthemes notifications widgetsaddons windowsystem xmlgui \
i18n iconthemes notifications phonon widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= core dbus gui phonon4 widgets xml \
USE_QT= core dbus gui widgets xml \
buildtools:build qmake:build
USE_XORG= ice sm x11 xext xtst

Expand Down
4 changes: 2 additions & 2 deletions astro/marble/Makefile
Expand Up @@ -14,12 +14,12 @@ LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip@qt5
USES= cmake compiler:c++11-lang desktop-file-utils gettext \
kde:5 qt:5 shared-mime-info tar:xz xorg
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools i18n jobwidgets kio newstuff package parts \
crash doctools i18n jobwidgets kio newstuff package parts phonon \
plasma-framework plasma-workspace-wallpapers runner service solid \
sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative designer gui location network opengl \
phonon4 printsupport script serialport sql svg webchannel widgets xml \
printsupport script serialport sql svg webchannel widgets xml \
buildtools:build qmake:build testlib:build
USE_XORG= x11

Expand Down
4 changes: 2 additions & 2 deletions audio/audiocd-kio/Makefile
Expand Up @@ -19,10 +19,10 @@ USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash guiaddons i18n iconthemes itemviews \
jobwidgets kcmutils kdelibs4support kio notifications parts \
service solid sonnet textwidgets unitconversion widgetsaddons \
phonon service solid sonnet textwidgets unitconversion widgetsaddons \
windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus gui network phonon4 printsupport widgets \
USE_QT= concurrent core dbus gui network printsupport widgets \
xml \
buildtools:build qmake:build

Expand Down
4 changes: 2 additions & 2 deletions audio/juk/Makefile
Expand Up @@ -13,10 +13,10 @@ LIB_DEPENDS= libtag.so:audio/taglib
USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons globalaccel i18n iconthemes itemviews \
jobwidgets kio notifications service solid sonnet textwidgets \
jobwidgets kio notifications phonon service solid sonnet textwidgets \
wallet widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus gui network phonon4 svg widgets xml \
USE_QT= concurrent core dbus gui network svg widgets xml \
buildtools:build qmake:build testlib:build
USE_XORG= x11

Expand Down
4 changes: 2 additions & 2 deletions audio/libkcompactdisc/Makefile
Expand Up @@ -8,9 +8,9 @@ WWW= https://www.kde.org/

USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= coreaddons emoticons i18n itemmodels itemviews \
kdelibs4support solid \
kdelibs4support phonon solid \
ecm:build
USE_QT= core dbus gui phonon4 widgets \
USE_QT= core dbus gui widgets \
buildtools:build qmake:build
USE_LDCONFIG= yes

Expand Down
4 changes: 2 additions & 2 deletions deskutils/basket/Makefile
Expand Up @@ -21,9 +21,9 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext-tools \
USE_KDE= ecm archive auth codecs completion config configwidgets \
coreaddons crash dbusaddons doctools filemetadata globalaccel \
guiaddons i18n iconthemes jobwidgets kcmutils kio \
notifications parts service solid sonnet textwidgets \
notifications parts phonon service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui
USE_QT= concurrent core dbus gui network phonon4 testlib widgets xml \
USE_QT= concurrent core dbus gui network testlib widgets xml \
buildtools:build qmake:build
USE_XORG= x11

Expand Down
4 changes: 2 additions & 2 deletions deskutils/kalarm/Makefile
Expand Up @@ -13,7 +13,7 @@ USES= cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 \
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
notifications notifyconfig parts service solid sonnet textwidgets \
notifications notifyconfig parts phonon service solid sonnet textwidgets \
unitconversion wallet widgetsaddons windowsystem xmlgui \
ecm:build
# pim components
Expand All @@ -22,7 +22,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime calendarcore \
idletime libkdepim mailcommon mailtransport mime \
pimcommon pimtextedit imap \
kdepim-runtime5:run
USE_QT= concurrent core dbus gui network phonon4 printsupport widgets \
USE_QT= concurrent core dbus gui network printsupport widgets \
x11extras xml \
buildtools:build qmake:build
USE_XORG= x11
Expand Down
4 changes: 2 additions & 2 deletions deskutils/korganizer/Makefile
Expand Up @@ -14,7 +14,7 @@ USE_GL= gl
USE_KDE= attica auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons i18n iconthemes \
itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \
newstuff notifications parts service solid sonnet textwidgets \
newstuff notifications parts phonon service solid sonnet textwidgets \
unitconversion wallet widgetsaddons windowsystem xmlgui \
ecm:build
# pim components
Expand All @@ -24,7 +24,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \
imap incidenceeditor kontactinterface ldap \
libkdepim mailtransport mime pimcommon pimtextedit \
kdepim-runtime5:run
USE_QT= concurrent core dbus gui multimedia network phonon4 printsupport widgets xml \
USE_QT= concurrent core dbus gui multimedia network printsupport widgets xml \
buildtools:build qmake:build
USE_XORG= x11
USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions devel/kf6-knotifyconfig/Makefile
Expand Up @@ -10,8 +10,8 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra
USES= cmake gettext gl kde:6 qt:6 tar:xz
USE_GL= gl opengl
USE_KDE= completion config coreaddons i18n jobwidgets kio notifications \
service solid widgetsaddons xmlgui \
phonon service solid widgetsaddons xmlgui \
ecm:build
USE_QT= base phonon4
USE_QT= base

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions devel/kio-extras/Makefile
Expand Up @@ -16,10 +16,10 @@ USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons dnssd doctools \
emoticons guiaddons i18n iconthemes init itemmodels itemviews \
jobwidgets js kdelibs4support khtml kio notifications parts \
pty service solid sonnet syntaxhighlighting textwidgets unitconversion \
phonon pty service solid sonnet syntaxhighlighting textwidgets unitconversion \
widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui location network phonon4 printsupport \
USE_QT= concurrent core dbus declarative gui location network printsupport \
sql svg testlib webchannel widgets xml \
buildtools:build qmake:build
USE_XORG= x11 xcursor
Expand Down
2 changes: 1 addition & 1 deletion devel/qt5/Makefile
Expand Up @@ -9,7 +9,7 @@ WWW= https://www.qt.io/
# * phonon4 is not part of Qt itself.
# * we don't want to pull in wayland just yet.
# XXX(rene) exclude webengine and sql-ibase
USE_QT= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:Nwebengine:Nsql-ibase:S/$/:run/}
USE_QT= ${_USE_QT_ALL:Ndeclarative:Nwayland:Nwebengine:Nsql-ibase:S/$/:run/}
USES= metaport qt:5

.include <bsd.port.mk>
2 changes: 1 addition & 1 deletion devel/qt6/Makefile
Expand Up @@ -7,6 +7,6 @@ COMMENT= Cross-platform application and UI framework (metaport)
WWW= https://www.qt.io/

USES= metaport qt:6
USE_QT= ${_USE_QT_ALL:Nphonon4:S/$/:run/}
USE_QT= ${_USE_QT_ALL:S/$/:run/}

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions editors/calligra/Makefile
Expand Up @@ -49,11 +49,11 @@ USE_KDE= activities akonadicontacts archive auth bookmarks calendarcore \
crash dbusaddons doctools emoticons guiaddons holidays i18n \
iconthemes init itemmodels itemviews jobwidgets js kcmutils \
kdelibs4support khtml kio kross notifications notifyconfig \
okular parts service solid sonnet texteditor textwidgets \
okular parts phonon service solid sonnet texteditor textwidgets \
threadweaver unitconversion wallet widgetsaddons windowsystem \
xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui network opengl phonon4 \
USE_QT= concurrent core dbus declarative gui network opengl \
printsupport script sql svg testlib widgets x11extras \
xml \
buildtools:build qmake:build
Expand Down
5 changes: 3 additions & 2 deletions games/auralquiz/Makefile
Expand Up @@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

LIB_DEPENDS= libtag.so:audio/taglib

USES= compiler:c++11-lang gl qmake qt:5
USES= compiler:c++11-lang gl kde:5 qmake qt:5
USE_GL= gl
USE_QT= core gui widgets phonon4 qmake:build buildtools:build
USE_KDE= phonon
USE_QT= core gui widgets qmake:build buildtools:build

PORTDOCS= CHANGELOG README TODO

Expand Down
4 changes: 2 additions & 2 deletions games/blinken/Makefile
Expand Up @@ -8,9 +8,9 @@ WWW= https://edu.kde.org/blinken/

USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
doctools guiaddons i18n widgetsaddons xmlgui \
doctools guiaddons i18n phonon widgetsaddons xmlgui \
ecm:build
USE_QT= core dbus gui phonon4 svg widgets xml \
USE_QT= core dbus gui svg widgets xml \
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS
Expand Down
4 changes: 2 additions & 2 deletions games/bomber/Makefile
Expand Up @@ -8,9 +8,9 @@ WWW= https://www.kde.org/applications/games/bomber/

USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
i18n kio libkdegames widgetsaddons xmlgui \
i18n kio libkdegames phonon widgetsaddons xmlgui \
ecm:build
USE_QT= core dbus declarative gui network widgets phonon4 xml \
USE_QT= core dbus declarative gui network widgets xml \
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS
Expand Down
4 changes: 2 additions & 2 deletions games/kblocks/Makefile
Expand Up @@ -9,9 +9,9 @@ WWW= https://www.kde.org/applications/games/kblocks/
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons i18n itemmodels kio libkdegames newstuff \
notifyconfig textwidgets widgetsaddons windowsystem xmlgui \
notifyconfig phonon textwidgets widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= core dbus declarative gui network phonon4 svg testlib widgets \
USE_QT= core dbus declarative gui network svg testlib widgets \
xml \
buildtools:build qmake:build

Expand Down
4 changes: 2 additions & 2 deletions games/kbounce/Makefile
Expand Up @@ -9,10 +9,10 @@ WWW= https://www.kde.org/applications/games/kbounce/
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons guiaddons i18n iconthemes jobwidgets kio \
libkdegames notifyconfig service solid textwidgets widgetsaddons \
libkdegames notifyconfig phonon service solid textwidgets widgetsaddons \
windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui network phonon4 svg \
USE_QT= concurrent core dbus declarative gui network svg \
testlib widgets xml \
buildtools:build qmake:build

Expand Down
4 changes: 2 additions & 2 deletions games/kolf/Makefile
Expand Up @@ -10,10 +10,10 @@ USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons guiaddons i18n iconthemes \
itemviews jobwidgets kdelibs4support kio libkdegames \
notifications parts service solid sonnet textwidgets \
notifications parts phonon service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui network phonon4 printsupport \
USE_QT= concurrent core dbus declarative gui network printsupport \
widgets xml \
buildtools:build qmake:build

Expand Down
4 changes: 2 additions & 2 deletions games/kollision/Makefile
Expand Up @@ -8,10 +8,10 @@ WWW= https://www.kde.org/applications/games/kollision/

USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
i18n kio libkdegames newstuff notifyconfig textwidgets \
i18n kio libkdegames newstuff notifyconfig phonon textwidgets \
widgetsaddons xmlgui \
ecm:build
USE_QT= core dbus declarative gui network phonon4 svg widgets xml \
USE_QT= core dbus declarative gui network svg widgets xml \
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS
Expand Down
4 changes: 2 additions & 2 deletions games/kpat/Makefile
Expand Up @@ -13,10 +13,10 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 pkgconfig \
qt:5 shared-mime-info tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash dbusaddons guiaddons i18n iconthemes itemviews \
kdeclarative kio libkdegames newstuff notifyconfig service \
kdeclarative kio libkdegames newstuff notifyconfig phonon service \
textwidgets widgetsaddons xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui network phonon4 svg widgets xml \
USE_QT= concurrent core dbus declarative gui network svg widgets xml \
buildtools:build qmake:build testlib:build
CMAKE_ON= WITH_BH_SOLVER

Expand Down
4 changes: 2 additions & 2 deletions games/ksirk/Makefile
Expand Up @@ -8,10 +8,10 @@ WWW= https://www.kde.org/applications/games/ksirk/

USES= cmake compiler:c++11-lang kde:5 qca qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash i18n iconthemes kio libkdegames newstuff service wallet \
crash i18n iconthemes kio libkdegames newstuff phonon service wallet \
widgetsaddons xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui network phonon4 svg \
USE_QT= concurrent core dbus declarative gui network svg \
widgets xml \
buildtools:build qmake:build testlib:build
USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions games/ktuberling/Makefile
Expand Up @@ -11,11 +11,11 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons emoticons guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kio libkdegames newstuff notifications \
notifyconfig parts service solid sonnet textwidgets \
notifyconfig parts phonon service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus declarative gui multimedia network \
phonon4 printsupport svg testlib widgets xml \
printsupport svg testlib widgets xml \
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS
Expand Down
4 changes: 2 additions & 2 deletions graphics/gwenview-devel/Makefile
Expand Up @@ -21,10 +21,10 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext gl jpeg \
USE_KDE= activities baloo5 bookmarks colorscheme completion config \
configwidgets coreaddons filemetadata guiaddons i18n \
iconthemes itemmodels itemviews jobwidgets kio notifications \
parts purpose service solid wayland widgetsaddons windowsystem \
parts phonon purpose service solid wayland widgetsaddons windowsystem \
xmlgui \
ecm:build
USE_QT= base phonon4 svg wayland
USE_QT= base svg wayland
USE_XORG= x11
USE_GL= gl opengl

Expand Down
4 changes: 2 additions & 2 deletions graphics/gwenview/Makefile
Expand Up @@ -22,10 +22,10 @@ USE_KDE= activities auth baloo bookmarks codecs completion config \
configwidgets coreaddons emoticons filemetadata guiaddons i18n \
iconthemes init itemmodels itemviews jobwidgets \
kdelibs4support kimageformats kio libkdcraw libkipi \
notifications parts service solid sonnet textwidgets \
notifications parts phonon service solid sonnet textwidgets \
widgetsaddons windowsystem xmlgui \
ecm:build
USE_QT= concurrent core dbus gui network opengl phonon4 printsupport \
USE_QT= concurrent core dbus gui network opengl printsupport \
svg widgets x11extras xml \
buildtools:build qmake:build
USE_XORG= x11
Expand Down
4 changes: 2 additions & 2 deletions graphics/kamerka/Makefile
Expand Up @@ -17,11 +17,11 @@ LIB_DEPENDS= libv4l2.so:multimedia/libv4l \
USES= cmake compiler:c++11-lang kde:5 qt:5 xorg
USE_GITHUB= yes
GH_ACCOUNT= dos1
USE_QT= concurrent core dbus declarative gui network phonon4 printsupport script xml widgets \
USE_QT= concurrent core dbus declarative gui network printsupport script xml widgets \
qmake:build buildtools:build
USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons crash \
guiaddons i18n iconthemes init itemviews jobwidgets kdeclarative kdelibs4support \
kio notifications package parts service solid sonnet textwidgets \
kio notifications package parts phonon service solid sonnet textwidgets \
unitconversion xmlgui widgetsaddons windowsystem \
doctools:build ecm:build
USE_XORG= x11
Expand Down

0 comments on commit b2a438e

Please sign in to comment.