From b2a438e1ba2f1f806519a925c2f241d2f4675c65 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 3 Dec 2023 22:44:37 +0100 Subject: [PATCH] framework: move 'phonon4' from qt.mk to kde.mk as 'phonon' To depend on phonon, you now need USES= kde: USE_KDE=phonon if you want to depend on the backend, also add USE_KDE= phonon-backend --- Mk/Uses/kde.mk | 14 ++++++++++++-- Mk/Uses/qt.mk | 5 +---- accessibility/kmousetool/Makefile | 4 ++-- astro/marble/Makefile | 4 ++-- audio/audiocd-kio/Makefile | 4 ++-- audio/juk/Makefile | 4 ++-- audio/libkcompactdisc/Makefile | 4 ++-- deskutils/basket/Makefile | 4 ++-- deskutils/kalarm/Makefile | 4 ++-- deskutils/korganizer/Makefile | 4 ++-- devel/kf6-knotifyconfig/Makefile | 4 ++-- devel/kio-extras/Makefile | 4 ++-- devel/qt5/Makefile | 2 +- devel/qt6/Makefile | 2 +- editors/calligra/Makefile | 4 ++-- games/auralquiz/Makefile | 5 +++-- games/blinken/Makefile | 4 ++-- games/bomber/Makefile | 4 ++-- games/kblocks/Makefile | 4 ++-- games/kbounce/Makefile | 4 ++-- games/kolf/Makefile | 4 ++-- games/kollision/Makefile | 4 ++-- games/kpat/Makefile | 4 ++-- games/ksirk/Makefile | 4 ++-- games/ktuberling/Makefile | 4 ++-- graphics/gwenview-devel/Makefile | 4 ++-- graphics/gwenview/Makefile | 4 ++-- graphics/kamerka/Makefile | 4 ++-- graphics/kphotoalbum/Makefile | 4 ++-- graphics/okular/Makefile | 4 ++-- irc/konversation/Makefile | 4 ++-- irc/kvirc/Makefile | 4 ++-- irc/quassel/Makefile | 6 ++++-- misc/klettres/Makefile | 4 ++-- misc/kwordquiz/Makefile | 4 ++-- multimedia/dragon/Makefile | 4 ++-- multimedia/kaffeine/Makefile | 4 ++-- multimedia/kmplayer/Makefile | 4 ++-- multimedia/phonon-designerplugin/Makefile | 4 ++-- multimedia/phonon-gstreamer/Makefile | 4 ++-- multimedia/phonon-vlc/Makefile | 4 ++-- net-im/kopete/Makefile | 4 ++-- net-p2p/ktorrent/Makefile | 4 ++-- net/mailcommon/Makefile | 4 ++-- www/kf5-khtml/Makefile | 4 ++-- x11-fm/dolphin-devel/Makefile | 4 ++-- x11-fm/dolphin/Makefile | 4 ++-- x11/plasma5-plasma-desktop/Makefile | 4 ++-- x11/plasma5-plasma-workspace/Makefile | 4 ++-- x11/plasma5-plasma/Makefile | 2 +- x11/plasma6-plasma-workspace/Makefile | 4 ++-- 51 files changed, 111 insertions(+), 101 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 33db1bf5d6c7d..609c37c1638b3 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -342,10 +342,13 @@ _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 \ @@ -353,7 +356,8 @@ _USE_KDE6_ALL= ecm colorscheme \ 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 @@ -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 ============== diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 276dfa1035fcd..330cf6deaea84 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -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 @@ -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 diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile index 09163dad44e1e..608869dd60474 100644 --- a/accessibility/kmousetool/Makefile +++ b/accessibility/kmousetool/Makefile @@ -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 diff --git a/astro/marble/Makefile b/astro/marble/Makefile index 7f05bae962024..d7841ce73ced2 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -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 diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile index 06987db58bbb7..2fd459721e4d7 100644 --- a/audio/audiocd-kio/Makefile +++ b/audio/audiocd-kio/Makefile @@ -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 diff --git a/audio/juk/Makefile b/audio/juk/Makefile index db1247e646f04..aab3b6b5aef3a 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -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 diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile index 2655e9c2093f5..450bf5150bcd8 100644 --- a/audio/libkcompactdisc/Makefile +++ b/audio/libkcompactdisc/Makefile @@ -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 diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index 61e3d31be75fe..c72679cf91c17 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -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 diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile index be11a8c75a933..f7ec9b2a4bf5f 100644 --- a/deskutils/kalarm/Makefile +++ b/deskutils/kalarm/Makefile @@ -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 @@ -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 diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile index 0f368b2f286dd..89cacc49bae76 100644 --- a/deskutils/korganizer/Makefile +++ b/deskutils/korganizer/Makefile @@ -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 @@ -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 diff --git a/devel/kf6-knotifyconfig/Makefile b/devel/kf6-knotifyconfig/Makefile index 0d9d61647bc40..fbf546d6612c3 100644 --- a/devel/kf6-knotifyconfig/Makefile +++ b/devel/kf6-knotifyconfig/Makefile @@ -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 diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile index 2c85e62cc395a..4354e3fe343ec 100644 --- a/devel/kio-extras/Makefile +++ b/devel/kio-extras/Makefile @@ -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 diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index c29af0dfa1f35..32ca66567e7ba 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -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 diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile index ad39cb20c43ed..c4e795320e423 100644 --- a/devel/qt6/Makefile +++ b/devel/qt6/Makefile @@ -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 diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index c3bf11d845b38..26c7123d410ee 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -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 diff --git a/games/auralquiz/Makefile b/games/auralquiz/Makefile index 3d9ec558f5a76..cf2e7f79c793a 100644 --- a/games/auralquiz/Makefile +++ b/games/auralquiz/Makefile @@ -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 diff --git a/games/blinken/Makefile b/games/blinken/Makefile index b4fa41daef397..c5c427bef4b78 100644 --- a/games/blinken/Makefile +++ b/games/blinken/Makefile @@ -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 diff --git a/games/bomber/Makefile b/games/bomber/Makefile index aee53e159b234..7259ca34bade0 100644 --- a/games/bomber/Makefile +++ b/games/bomber/Makefile @@ -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 diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile index dfec27a346768..e15d637308d2f 100644 --- a/games/kblocks/Makefile +++ b/games/kblocks/Makefile @@ -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 diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile index 86b5b68b9bde5..f04dba1aa7e0e 100644 --- a/games/kbounce/Makefile +++ b/games/kbounce/Makefile @@ -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 diff --git a/games/kolf/Makefile b/games/kolf/Makefile index d5d07f9fd9abb..e245627481cb4 100644 --- a/games/kolf/Makefile +++ b/games/kolf/Makefile @@ -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 diff --git a/games/kollision/Makefile b/games/kollision/Makefile index 2dabe0906bade..2fbd6c25b89b9 100644 --- a/games/kollision/Makefile +++ b/games/kollision/Makefile @@ -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 diff --git a/games/kpat/Makefile b/games/kpat/Makefile index 805fba963f39d..8b34a0f493051 100644 --- a/games/kpat/Makefile +++ b/games/kpat/Makefile @@ -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 diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile index fc284c406d73b..714b9721d9bf1 100644 --- a/games/ksirk/Makefile +++ b/games/ksirk/Makefile @@ -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 diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile index 51b9a6a675dd8..35d938944f1aa 100644 --- a/games/ktuberling/Makefile +++ b/games/ktuberling/Makefile @@ -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 diff --git a/graphics/gwenview-devel/Makefile b/graphics/gwenview-devel/Makefile index 389030352aae4..2832b2c3dba85 100644 --- a/graphics/gwenview-devel/Makefile +++ b/graphics/gwenview-devel/Makefile @@ -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 diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 8e73d15c2c933..ca5ec748dcfd9 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -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 diff --git a/graphics/kamerka/Makefile b/graphics/kamerka/Makefile index f5ff4c533eae2..5efd6af8223a2 100644 --- a/graphics/kamerka/Makefile +++ b/graphics/kamerka/Makefile @@ -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 diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 4dbe052e2ca2f..1ab2e724574c5 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ USES= cmake compiler:c++11-lang desktop-file-utils jpeg kde:5 \ pkgconfig qt:5 shebangfix tar:xz xorg USE_KDE= archive auth codecs completion config configwidgets coreaddons \ - i18n iconthemes jobwidgets kio marble purpose service solid \ + i18n iconthemes jobwidgets kio marble phonon purpose service solid \ sonnet textwidgets widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus declarative gui location network phonon4 \ +USE_QT= concurrent core dbus declarative gui location network \ printsupport sql webchannel widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index 49535d3d90c6a..4f0a41d415af1 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -26,11 +26,11 @@ USES= cmake compiler:c++11-lib desktop-file-utils \ USE_KDE= activities archive auth bookmarks codecs completion config \ configwidgets coreaddons crash dbusaddons emoticons i18n \ iconthemes init itemmodels itemviews jobwidgets js \ - kdelibs4support khtml kio libkexiv2 parts pty \ + kdelibs4support khtml kio libkexiv2 parts phonon pty \ service solid sonnet textwidgets threadweaver wallet \ widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus declarative gui network phonon4 printsupport speech \ +USE_QT= concurrent core dbus declarative gui network printsupport speech \ svg widgets xml \ buildtools:build qmake:build testlib:build USE_XORG= x11 diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile index 97a31656c0338..629de77d6e69b 100644 --- a/irc/konversation/Makefile +++ b/irc/konversation/Makefile @@ -13,11 +13,11 @@ USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext kde:5 \ USE_KDE= archive attica auth bookmarks codecs completion config \ configwidgets coreaddons crash dbusaddons doctools \ emoticons globalaccel i18n iconthemes idletime itemviews \ - jobwidgets kio newstuff notifications notifyconfig parts service solid \ + jobwidgets kio newstuff notifications notifyconfig parts phonon service solid \ sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \ ecm:build \ init:run -USE_QT= concurrent core dbus gui multimedia network phonon4 widgets xml \ +USE_QT= concurrent core dbus gui multimedia network widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 8bc6a94d27098..5139dd2f86147 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -19,9 +19,9 @@ USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext gnome \ USE_GNOME= glib20 USE_PERL5= run build USE_KDE= auth codecs config configwidgets coreaddons i18n notifications \ - service widgetsaddons windowsystem xmlgui \ + phonon service widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= core dbus gui multimedia network phonon4 printsupport sql svg \ +USE_QT= core dbus gui multimedia network printsupport sql svg \ widgets x11extras xml \ buildtools:build qmake:build USE_XORG= ice sm x11 xext xrender xscrnsaver diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index 6693aef46ccd5..3669c97d420ff 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -36,7 +36,8 @@ OPTIONS_SUB= yes CLIENT_DESC= Quassel client (for use with core) CLIENT_CMAKE_BOOL= WANT_QTCLIENT -CLIENT_USE= qt=dbus,gui,multimedia,phonon4,webengine,widgets +CLIENT_USES= kde:5 +CLIENT_USE= qt=dbus,gui,multimedia,webengine,widgets kde=phonon CLIENT_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 CLIENT_PREVENTS= CORE CLIENT_PREVENTS_MSG= Quassel core server should be installed via irc/quassel-core port @@ -54,7 +55,8 @@ CORE_PREVENTS= CLIENT MONO KDE SPELL MONO_DESC= Quassel standalone (monolithic binary: core+client combined) MONO_CMAKE_BOOL= WANT_MONO -MONO_USE= qt=dbus,gui,multimedia,phonon4,script,sql,webengine,widgets +MONO_USES= kde:5 +MONO_USE= qt=dbus,gui,multimedia,script,sql,webengine,widgets kde=phonon MONO_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 MONO_PREVENTS= CORE MONO_PREVENTS_MSG= Quassel core server should be installed via irc/quassel-core port diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile index d118bfd220069..63c2c77f5f3e9 100644 --- a/misc/klettres/Makefile +++ b/misc/klettres/Makefile @@ -9,9 +9,9 @@ WWW= https://edu.kde.org/klettres USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz USE_KDE= attica auth codecs completion config configwidgets coreaddons \ crash emoticons i18n init itemmodels \ - kdelibs4support newstuff service widgetsaddons xmlgui \ + kdelibs4support newstuff phonon service widgetsaddons xmlgui \ doctools:build ecm:build -USE_QT= core dbus gui network phonon4 svg widgets xml \ +USE_QT= core dbus gui network svg widgets xml \ buildtools:build qmake:build testlib:build OPTIONS_DEFINE= DOCS diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile index 3010bad94ef1f..afdba317de36d 100644 --- a/misc/kwordquiz/Makefile +++ b/misc/kwordquiz/Makefile @@ -15,10 +15,10 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets \ coreaddons crash doctools emoticons guiaddons i18n \ iconthemes init itemmodels itemviews jobwidgets kdeclarative \ kdelibs4support kio libkeduvocdocument newstuff notifications \ - notifyconfig parts service solid sonnet textwidgets \ + notifyconfig parts phonon service solid sonnet textwidgets \ unitconversion widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= core dbus gui network multimedia phonon4 printsupport widgets xml \ +USE_QT= core dbus gui network multimedia printsupport widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile index fd3bfbc845009..cd57c44191a12 100644 --- a/multimedia/dragon/Makefile +++ b/multimedia/dragon/Makefile @@ -13,10 +13,10 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 qt:5 \ tar:xz xorg USE_KDE= auth codecs completion config configwidgets coreaddons crash \ dbusaddons doctools kio service sonnet textwidgets i18n \ - iconthemes jobwidgets notifications parts solid widgetsaddons \ + iconthemes jobwidgets notifications parts phonon solid widgetsaddons \ windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus gui network phonon4 widgets xml \ +USE_QT= concurrent core dbus gui network widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index c773d1227c132..836a328b3eab2 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -19,9 +19,9 @@ USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \ pkgconfig kde:5 qt:5 tar:xz xorg USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons i18n itemviews kio solid dbusaddons jobwidgets \ - service widgetsaddons windowsystem xmlgui \ + phonon service widgetsaddons windowsystem xmlgui \ doctools:build ecm:build -USE_QT= concurrent core dbus gui network phonon4 sql svg x11extras xml \ +USE_QT= concurrent core dbus gui network sql svg x11extras xml \ widgets qmake:build buildtools:build USE_XORG= x11 xscrnsaver diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index e97b64b9abbf5..160037b806011 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -31,12 +31,12 @@ RUN_DEPENDS= mplayer:multimedia/mplayer USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext-runtime \ gnome kde:5 pkgconfig qt:5 tar:bz2 xorg USE_GNOME= cairo gdkpixbuf2 gtk20 -USE_QT= concurrent core dbus gui network phonon4 printsupport \ +USE_QT= concurrent core dbus gui network printsupport \ svg widgets x11extras xml \ buildtools:build qmake:build USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes init itemviews \ - jobwidgets mediaplayer notifications parts service \ + jobwidgets mediaplayer notifications parts phonon service \ textwidgets unitconversion widgetsaddons windowsystem \ xmlgui kdelibs4support kio solid sonnet \ doctools:build diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile index 74e4afeec75b2..efe794e3b343d 100644 --- a/multimedia/phonon-designerplugin/Makefile +++ b/multimedia/phonon-designerplugin/Makefile @@ -12,8 +12,8 @@ WWW= https://userbase.kde.org/Phonon LICENSE= LGPL21 USES= cmake:insource compiler:c++11-lang kde:5 qt:5 tar:xz -USE_KDE= ecm:build -USE_QT= core designer gui phonon4 uiplugin widgets xml \ +USE_KDE= phonon ecm:build +USE_QT= core designer gui uiplugin widgets xml \ buildtools:build qmake:build CMAKE_ON= PHONON_BUILD_QT5 CMAKE_OFF= PHONON_BUILD_QT6 diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index 34e13a3a83d31..f8971f448d610 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -20,8 +20,8 @@ USES= cmake compiler:c++11-lang gl gnome gstreamer kde:5 pkgconfig \ qt:5 tar:xz xorg USE_GL= gl USE_GNOME= glib20 libxml2 -USE_KDE= ecm:build -USE_QT= core gui opengl phonon4 widgets x11extras \ +USE_KDE= phonon ecm:build +USE_QT= core gui opengl widgets x11extras \ buildtools:build qmake:build USE_XORG= x11 diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 532ad1117e175..c1196ab69ca2e 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= libvlc.so:multimedia/vlc USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} pkgconfig \ qt:${FLAVOR:S/qt//} tar:xz -USE_KDE= ecm:build -USE_QT= ${_USE_QT_${FLAVOR}} phonon4 +USE_KDE= phonon ecm:build +USE_QT= ${_USE_QT_${FLAVOR}} CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} CMAKE_OFF= ${_CMAKE_OFF_${FLAVOR}} diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index 9183d2c3f4d35..5b19eb49c312c 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -18,13 +18,13 @@ USE_GNOME= libxml2 libxslt USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons dnssd emoticons guiaddons i18n \ iconthemes itemviews jobwidgets js kcmutils kdelibs4support \ - khtml kio notifications notifyconfig parts service solid sonnet \ + khtml kio notifications notifyconfig parts phonon service solid sonnet \ syntaxhighlighting texteditor textwidgets unitconversion wallet widgetsaddons \ windowsystem xmlgui \ ecm:build # KDE PIM components USE_KDE+= contacts identitymanagement libkleo pimtextedit -USE_QT= concurrent core dbus gui network phonon4 printsupport sql widgets xml \ +USE_QT= concurrent core dbus gui network printsupport sql widgets xml \ buildtools:build qmake:build testlib:build USE_XORG= x11 diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile index 27b57fc019a88..5ee6391eb1424 100644 --- a/net-p2p/ktorrent/Makefile +++ b/net-p2p/ktorrent/Makefile @@ -19,11 +19,11 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext \ USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons dnssd i18n iconthemes itemviews \ jobwidgets kcmutils kio kross notifications \ - notifyconfig parts plotting service \ + notifyconfig parts phonon plotting service \ solid sonnet syndication textwidgets 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 \ script webchannel widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile index 9a3c3594ce4df..e5d276ff99e70 100644 --- a/net/mailcommon/Makefile +++ b/net/mailcommon/Makefile @@ -19,7 +19,7 @@ USES= cmake compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz \ xorg USE_KDE= archive auth codecs completion config configwidgets coreaddons \ guiaddons i18n iconthemes itemmodels itemviews jobwidgets kio \ - service solid sonnet syntaxhighlighting textwidgets \ + phonon service solid sonnet syntaxhighlighting textwidgets \ widgetsaddons windowsystem xmlgui \ ecm:build # pim components @@ -27,7 +27,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \ identitymanagement imap ktextaddons ldap libkdepim libkleo \ mailimporter mailtransport messagelib mime pimcommon \ pimtextedit -USE_QT= concurrent core dbus gui network phonon4 widgets xml \ +USE_QT= concurrent core dbus gui network widgets xml \ buildtools:build qmake:build USE_XORG= x11 USE_LDCONFIG= yes diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile index e1bc43355b874..3907c47a87808 100644 --- a/www/kf5-khtml/Makefile +++ b/www/kf5-khtml/Makefile @@ -12,10 +12,10 @@ USES= cmake compiler:c++11-lib gettext gperf jpeg kde:5 \ qt:5 tar:xz xorg USE_KDE= archive auth bookmarks codecs completion config \ configwidgets coreaddons globalaccel i18n iconthemes \ - jobwidgets js kio notifications parts service solid sonnet \ + jobwidgets js kio notifications parts phonon service solid sonnet \ textwidgets wallet widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= concurrent core dbus gui network phonon4 \ +USE_QT= concurrent core dbus gui network \ printsupport widgets x11extras xml \ buildtools:build qmake:build USE_XORG= ice sm x11 xext diff --git a/x11-fm/dolphin-devel/Makefile b/x11-fm/dolphin-devel/Makefile index 92deab8ff5a89..c2ed8177cdc17 100644 --- a/x11-fm/dolphin-devel/Makefile +++ b/x11-fm/dolphin-devel/Makefile @@ -16,10 +16,10 @@ USES= cmake compiler:c++11-lib desktop-file-utils gettext gl kde:6 \ USE_KDE= activities attica5 baloo5 bookmarks codecs colorscheme \ completion config configwidgets coreaddons crash dbusaddons \ filemetadata i18n iconthemes itemviews jobwidgets kcmutils kio \ - newstuff notifications parts service solid sonnet textwidgets \ + newstuff notifications parts phonon service solid sonnet textwidgets \ userfeedback widgetsaddons windowsystem xmlgui \ ecm:build -USE_QT= base declarative phonon4 +USE_QT= base declarative USE_GL= gl opengl USE_XORG= x11 diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile index e41ece367a94d..8935d0b0688b4 100644 --- a/x11-fm/dolphin/Makefile +++ b/x11-fm/dolphin/Makefile @@ -19,11 +19,11 @@ USE_KDE= activities attica auth baloo baloo-widgets bookmarks codecs \ completion config configwidgets coreaddons crash dbusaddons \ emoticons filemetadata i18n iconthemes init \ itemmodels itemviews jobwidgets kcmutils kde-cli-tools \ - kio newstuff notifications parts service \ + kio newstuff notifications parts phonon service \ solid sonnet texteditor textwidgets widgetsaddons \ windowsystem xmlgui \ doctools:build ecm:build -USE_QT= concurrent core dbus gui network phonon4 widgets xml \ +USE_QT= concurrent core dbus gui network widgets xml \ buildtools:build qmake:build USE_XORG= x11 diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile index de2335c6f0238..dcb464c0eddd1 100644 --- a/x11/plasma5-plasma-desktop/Makefile +++ b/x11/plasma5-plasma-desktop/Makefile @@ -37,13 +37,13 @@ USE_KDE= activities activities-stats attica auth baloo bookmarks codecs \ filemetadata globalaccel guiaddons i18n iconthemes init \ itemmodels itemviews jobwidgets kcmutils kdeclarative \ kdelibs4support kio libksysguard newstuff \ - notifications notifyconfig package parts plasma-framework \ + notifications notifyconfig package parts phonon plasma-framework \ plasma-workspace runner service solid sonnet textwidgets \ unitconversion widgetsaddons windowsystem xmlgui \ doctools:build ecm:build \ drkonqi:run infocenter:run kde-cli-tools:run kmenuedit:run \ ksysguard:run polkit-kde-agent-1:run systemsettings:run -USE_QT= concurrent core dbus declarative gui network phonon4 \ +USE_QT= concurrent core dbus declarative gui network \ printsupport sql wayland widgets x11extras xml \ buildtools:build qmake:build USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile index 36e0f2135a7c1..9db3c1bdb75af 100644 --- a/x11/plasma5-plasma-workspace/Makefile +++ b/x11/plasma5-plasma-workspace/Makefile @@ -38,7 +38,7 @@ USE_KDE= activities activities-stats activitymanagerd archive attica \ itemviews jobwidgets js jsembed kcmutils kdeclarative kdesu \ kio kscreenlocker kwin layer-shell-qt libkscreen \ libksysguard newstuff notifications notifyconfig package parts \ - people plasma-framework plasma-integration prison pty runner \ + people phonon plasma-framework plasma-integration prison pty runner \ service solid sonnet syntaxhighlighting texteditor textwidgets \ unitconversion wallet wayland widgetsaddons windowsystem \ xmlgui xmlrpcclient \ @@ -46,7 +46,7 @@ USE_KDE= activities activities-stats activitymanagerd archive attica \ breeze-icons:run breeze:run kded:run kquickcharts:run \ milou:run oxygen-icons5:run USE_QT= concurrent core dbus declarative graphicaleffects gui network \ - phonon4 printsupport qdbus script sql svg wayland \ + printsupport qdbus script sql svg wayland \ widgets x11extras xml \ buildtools:build qmake:build testlib:build \ paths:run quickcontrols:run diff --git a/x11/plasma5-plasma/Makefile b/x11/plasma5-plasma/Makefile index fa3fd1a5e7488..90078f603fe7c 100644 --- a/x11/plasma5-plasma/Makefile +++ b/x11/plasma5-plasma/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFAULT= ${OPTIONS_DEFINE} # Different from PHONON, because this is about the output plugins PHONON_DESC= Include phonon-vlc, for sound output -PHONON_RUN_DEPENDS= ${QT_PLUGINDIR}/phonon4qt5_backend/phonon_vlc_qt5.so:multimedia/phonon-vlc@qt5 +PHONON_USE= KDE=phonon-backend:run PULSEAUDIO_USE= KDE=plasma-pa:run .include diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile index 1872ec3569cde..6b86b4ff1cba5 100644 --- a/x11/plasma6-plasma-workspace/Makefile +++ b/x11/plasma6-plasma-workspace/Makefile @@ -32,12 +32,12 @@ USE_KDE= activities activities-stats archive attica5 auth baloo5 \ itemviews jobwidgets kcmutils kdeclarative kio kirigami-addons \ kirigami2 kpipewire kquickcharts kscreenlocker kwin \ layer-shell-qt libkscreen libksysguard libplasma newstuff \ - notifications notifyconfig package parts plasma5support prison \ + notifications notifyconfig package parts phonon plasma5support prison \ runner service solid sonnet statusnotifieritem svg \ syntaxhighlighting texteditor textwidgets unitconversion \ userfeedback wallet wayland widgetsaddons windowsystem xmlgui \ ecm:build plasma-wayland-protocols:build -USE_QT= 5compat base declarative phonon4 svg wayland +USE_QT= 5compat base declarative svg wayland USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xft xi xrender xtst post-patch: