This work is important to me and it would be nice if someone could review
it briefly. I have completely rebuilt our phonon ports infra structure.
- Merge multimedia/phonon-qt5 into multimedia/phonon and remove the
phonon MODULE.
- Update all phonon ports to the latest version.
- Regen all consumer WANTLIB's and bump them.
- Remove infrastructure/bin/portcheck bits.
Tested in a whole 6.6->current upgrade process and also on -current
only.
Test case 1 "6.6->current")
pkg_add upgrade
Obsolete package: phonon-vlc-0.10.3 (no longer maintained upstream)
Obsolete package: phonon-gstreamer-icons-4.9.1-qt5 (no longer maintained
upstream)
Obsolete package: phonon-gstreamer-4.9.1 (no longer maintained upstream)
Couldn't find updates for phonon-4.10.3 phonon-gstreamer-4.9.1
phonon-gstreamer-icons-4.9.1-qt5 phonon-qt5-4.10.3 phonon-qt5-gstreamer-4.9.1
phonon-vlc-0.10.3
Q:
This is correct for phonon-4.10.3 (Qt4 NOT phonon-qt5-4.10.3)? Do I see it
right that the user must first delete the obsolete packages? If I do this,
everything works clean.
Test case 2 "-current")
$ pkg_info|grep phonon
phonon-gstreamer-icons-4.9.1-qt5 GStreamer-based Phonon backend icons
phonon-qt5-4.10.3p0 multimedia layer for Qt5/KDE5
phonon-qt5-gstreamer-4.9.1 GStreamer-based Phonon backend
phonon-qt5-vlc-0.10.3 VLC-based Phonon backend
$ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all doas pkg_add -u
phonon-qt5-4.10.3p0->phonon-4.11.1 forward dependencies:
| Dependency of phonon-qt5-vlc-0.10.3 on phonon-qt5->=4.10.1 doesn't match
| Dependency of phonon-qt5-gstreamer-4.9.1 on phonon-qt5->=4.10.1 doesn't match
Merging phonon-qt5-vlc-0.10.3->phonon-backend-vlc-0.11.1 (ok)
Merging phonon-qt5-gstreamer-4.9.1->phonon-backend-gstreamer-4.10.0 (ok)
phonon-gstreamer-icons-4.9.1-qt5+phonon-qt5-4.10.3p0+phonon-qt5-gstreamer-4.9.1+phonon-qt5-vlc-0.10.3->phonon-4.11.1+phonon-backend-gstreamer-4.10.0+phonon-backend-vlc-0.11.1:
ok
Running tags: ok
$ pkg_info|grep phonon
phonon-4.11.1 multimedia layer for Qt5/KDE5
phonon-backend-gstreamer-4.10.0 GStreamer-based Phonon backend
phonon-backend-vlc-0.11.1 VLC-based Phonon backend
Feedback, Comments? OK?
If no one considered it, I would commit it next weekend.
Rafael Sadowski
diff --git a/devel/kf5/khtml/Makefile b/devel/kf5/khtml/Makefile
index 75d58fdfa25..55e89b7ef4e 100644
--- a/devel/kf5/khtml/Makefile
+++ b/devel/kf5/khtml/Makefile
@@ -2,6 +2,7 @@
COMMENT = original KDE HTML rendering engine
DISTNAME = khtml-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5KHtml 5.0
@@ -13,10 +14,8 @@ WANTLIB += KF5KIOWidgets KF5Notifications KF5Parts KF5Service
WANTLIB += KF5SonnetCore KF5SonnetUi KF5TextWidgets KF5Wallet
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport Qt5Widgets
-WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext gif jpeg m phonon4qt5experimental
-WANTLIB += png z
-
-MODULES = multimedia/phonon
+WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext gif jpeg m phonon4qt5
+WANTLIB += phonon4qt5experimental png z
BUILD_DEPENDS = devel/gettext,-tools
@@ -38,7 +37,8 @@ LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
graphics/giflib \
graphics/jpeg \
graphics/png \
- x11/qt5/qtx11extras
+ x11/qt5/qtx11extras \
+ multimedia/phonon
IS_PORTING_AID = Yes
diff --git a/devel/kf5/knotifyconfig/Makefile b/devel/kf5/knotifyconfig/Makefile
index 93b8cd31103..929c9b9fc50 100644
--- a/devel/kf5/knotifyconfig/Makefile
+++ b/devel/kf5/knotifyconfig/Makefile
@@ -2,15 +2,14 @@
COMMENT = KDE configuration dialog for desktop notifications
DISTNAME = knotifyconfig-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5NotifyConfig 5.0
WANTLIB += ${COMPILER_LIBCXX} KF5Completion KF5ConfigCore KF5CoreAddons
WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOWidgets KF5Service
WANTLIB += KF5WidgetsAddons Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
-WANTLIB += Qt5Network Qt5Widgets m
-
-MODULES = multimedia/phonon
+WANTLIB += Qt5Network Qt5Widgets m phonon4qt5
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kconfigwidgets>=${MODKF5_VERSION} \
@@ -24,10 +23,10 @@ LIB_DEPENDS =
devel/kf5/kcompletion>=${MODKF5_VERSION} \
devel/kf5/kio>=${MODKF5_VERSION} \
devel/kf5/kjobwidgets>=${MODKF5_VERSION} \
devel/kf5/kservice>=${MODKF5_VERSION} \
- devel/kf5/kwidgetsaddons>=${MODKF5_VERSION}
+ devel/kf5/kwidgetsaddons>=${MODKF5_VERSION} \
+ multimedia/phonon
CONFIGURE_ARGS += -DBUILD_TESTING=ON \
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=ON \
-
-DPhonon4Qt5_INCLUDE_DIR="${LOCALBASE}/include/phonon4qt5/"
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=ON
.include <bsd.port.mk>
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index c97d73607e2..0901d539e5a 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.383
+PKGNAME = quirks-3.384
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 47282629f85..631499eaa8b 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -442,6 +442,10 @@ my $stem_extensions = {
'py-aiodns' => 'py3-aiodns',
'ebc' => 'bc-gh',
'py-cares' => 'py3-cares',
+ 'phonon-qt5' => 'phonon',
+ 'phonon-qt5-gstreamer' => 'phonon-backend-gstreamer',
+ 'phonon-qt5-vlc' => 'phonon-backend-vlc',
+ 'phonon-gstreamer-icons' => 'phonon-backend-gstreamer',
};
my $obsolete_reason = {
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index d4ea9d77965..0a00959a6c4 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -5,6 +5,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
+REVISION = 0
SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
@@ -63,11 +64,11 @@ WANTLIB += Okular5Core Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
Qt5Network
WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xml SM X11
WANTLIB += Xext c fontconfig freetype gsl gslcblas iconv lcms2
-WANTLIB += m phonon4qt5experimental poppler poppler-qt5 qca-qt5
-WANTLIB += z
+WANTLIB += m phonon4qt5 phonon4qt5experimental poppler poppler-qt5
+WANTLIB += qca-qt5 z
+
+MODULES = devel/kf5
-MODULES = devel/kf5 \
- multimedia/phonon
# c++-14
COMPILER = base-clang ports-gcc
@@ -88,14 +89,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = converters/libiconv \
devel/gsl \
- graphics/kdiagram \
devel/kf5/kactivities \
devel/kf5/karchive \
+ devel/kf5/kcalendarcore \
devel/kf5/kcmutils \
devel/kf5/kcodecs\
devel/kf5/kcompletion \
devel/kf5/kconfig \
devel/kf5/kconfigwidgets \
+ devel/kf5/kcontacts \
devel/kf5/kcoreaddons \
devel/kf5/kdbusaddons \
devel/kf5/kdelibs4support \
@@ -114,18 +116,17 @@ LIB_DEPENDS = converters/libiconv \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
devel/kf5/sonnet \
+ graphics/kdiagram \
graphics/lcms2 \
graphics/openexr \
+ multimedia/phonon \
print/poppler,-qt5 \
security/qca-qt5 \
+ textproc/libwpd \
x11/kde-applications/okular \
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
- x11/qt5/qtx11extras \
- textproc/libwpd \
- devel/kf5/kcalendarcore \
- devel/kf5/kcontacts \
- x11/qt5/qtdeclarative
+ x11/qt5/qtx11extras
# Stuff we don't have ATM. Do not bother about CreateResources, it's
# pure optional run-time dependency.
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index ed601bb5199..627504de7aa 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -5,6 +5,7 @@ COMMENT = user-friendly TeX/LaTeX editor for KDE
CATEGORIES = editors
DISTNAME = kile-2.9.93
+REVISION = 0
HOMEPAGE = https://kile.sourceforge.io
@@ -27,13 +28,13 @@ WANTLIB += Okular5Core
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=kile/}
EXTRACT_SUFX = .tar.bz2
-MODULES = devel/kf5 \
- multimedia/phonon
+MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kdoctools \
devel/kf5/kinit \
- x11/kde-applications/kate
+ x11/kde-applications/kate \
+ multimedia/phonon
RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kdoctools \
diff --git a/infrastructure/bin/portcheck b/infrastructure/bin/portcheck
index 2ce3a71c9b5..83c37b3cf1b 100755
--- a/infrastructure/bin/portcheck
+++ b/infrastructure/bin/portcheck
@@ -1323,14 +1323,12 @@ check_wantlib() {
local kde3_module=false
local kde4_module=false
- local phonon_module=false
local gcc4_module=false
local v
for v in $modules; do case $v in
gcc4) gcc4_module=true;;
- multimedia/phonon) phonon_module=true;;
x11/kde) kde3_module=true;;
x11/kde4) kde4_module=true;;
esac; done
@@ -1380,10 +1378,6 @@ check_wantlib() {
fi
esac; done
- if $phonon_s_wantlib && ! $phonon_module; then
- err "${portref}missing multimedia/phonon in MODULES"
- fi
-
true
}
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 7f616927a20..4e843548722 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -61,7 +61,7 @@
SUBDIR += p5-Data-AMF
SUBDIR += p5-Mac-iTunes-Library
SUBDIR += p5-Storable-AMF
- SUBDIR += phonon-qt5
+ SUBDIR += phonon
SUBDIR += phonon-backend
SUBDIR += py-caption
SUBDIR += py-casttube,python3
diff --git a/multimedia/phonon-backend/Makefile
b/multimedia/phonon-backend/Makefile
index a6a27fd3cdb..c5c8290e201 100644
--- a/multimedia/phonon-backend/Makefile
+++ b/multimedia/phonon-backend/Makefile
@@ -2,7 +2,6 @@
SUBDIR =
SUBDIR += gstreamer
-SUBDIR += gstreamer,qt5
SUBDIR += vlc
.include <bsd.port.subdir.mk>
diff --git a/multimedia/phonon-backend/Makefile.inc
b/multimedia/phonon-backend/Makefile.inc
index 4b61d796df6..854c5ca1ae6 100644
--- a/multimedia/phonon-backend/Makefile.inc
+++ b/multimedia/phonon-backend/Makefile.inc
@@ -1,29 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.6 2019/07/12 21:07:46 sthen Exp $
-CATEGORIES += multimedia
+CATEGORIES += multimedia
# LGPL 2.1
PERMIT_PACKAGE = Yes
-FLAVOR ?=
-.if ${FLAVOR:Mqt5}
-MODULES = devel/kf5
-PKGNAME ?= ${DISTNAME:C/-backend/-qt5/}
-FULLPKGNAME ?= ${DISTNAME:C/-backend/-qt5/}
-BACKEND_DIR = lib/qt5/plugins/phonon4qt5_backend
-CONFIGURE_ARGS = -DPhonon_DIR:String=${LOCALBASE}/lib/cmake/phonon4qt5 \
- -DPHONON_BUILD_PHONON4QT5=Yes
-.else
-PKGNAME ?= ${DISTNAME:C/-backend//}
-FULLPKGNAME ?= ${DISTNAME:C/-backend//}
-MODULES = x11/kde4
-MODKDE4_USE =
-BACKEND_DIR = lib/kde4/plugins/phonon_s_backend
-CONFIGURE_ARGS = -DPhonon_DIR:String=${LOCALBASE}/lib/cmake/phonon
-.endif
-
-MODULES += multimedia/phonon
-MODPHONON_PLUGIN_DEPS = No
-SUBST_VARS = BACKEND_DIR
-
MAINTAINER ?= KDE porting team <openbsd-...@googlegroups.com>
+
+LIB_DEPENDS += multimedia/phonon
diff --git a/multimedia/phonon-backend/gstreamer/Makefile
b/multimedia/phonon-backend/gstreamer/Makefile
index 537de2d5e2a..2f42d8357cb 100644
--- a/multimedia/phonon-backend/gstreamer/Makefile
+++ b/multimedia/phonon-backend/gstreamer/Makefile
@@ -1,49 +1,31 @@
# $OpenBSD: Makefile,v 1.26 2020/06/13 16:22:52 rsadowski Exp $
-COMMENT-main = GStreamer-based Phonon backend
-COMMENT-icons = GStreamer-based Phonon backend icons
-VERSION = 4.9.1
+COMMENT = GStreamer-based Phonon backend
+
+VERSION = 4.10.0
DISTNAME = phonon-backend-gstreamer-${VERSION}
-PKGNAME-main = ${PKGNAME}
-PKGNAME-icons = phonon-gstreamer-icons-${VERSION}
-MASTER_SITES =
https://download.kde.org/stable/phonon/phonon-backend-gstreamer/${VERSION}/
+MASTER_SITES =
${MASTER_SITE_KDE:=stable/phonon/phonon-backend-gstreamer/${VERSION}/}
+EXTRACT_SUFX = .tar.xz
-FULLPKGNAME-main = ${PKGNAME}
-FULLPKGPATH-main = ${PKGPATH},${FLAVOR},-main
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB += Qt5X11Extras glib-2.0 gmodule-2.0 gobject-2.0 gstapp-1.0
+WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
+WANTLIB += gstvideo-1.0 gthread-2.0 m phonon4qt5 phonon4qt5experimental
-# deconflict Qt4 and Qt5 versions by extracting common data
-MULTI_PACKAGES = -main -icons
+MODULES = devel/kf5
-# icons are same, so not reason to have different packages
-PKG_ARCH-icons = *
+BUILD_DEPENDS = devel/gettext,-tools
-RUN_DEPENDS-icons = x11/gtk+3,-guic
# allow playing Vorbis and MP3 notification sounds out of the box
-RUN_DEPENDS-main = multimedia/gstreamer1/plugins-good \
- multimedia/gstreamer1/plugins-libav \
- ${BASE_PKGPATH},-icons
-
-LIB_DEPENDS-icons =
-LIB_DEPENDS-main = ${LIB_DEPENDS} \
- multimedia/gstreamer1/core \
- multimedia/gstreamer1/plugins-base
-
-WANTLIB-icons =
-WANTLIB-main = ${WANTLIB} ${COMPILER_LIBCXX} GL m
-WANTLIB-main += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB-main += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
-WANTLIB-main += gstreamer-1.0 gstvideo-1.0 gstapp-1.0
-
-FLAVORS = qt5
-FLAVOR = qt5
-.if ${FLAVOR:Mqt5}
-LIB_DEPENDS-main += x11/qt5/qtx11extras
-WANTLIB-main += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets Qt5X11Extras
-.else
-WANTLIB-main += QtGui QtOpenGL
-.endif
-
-WRKDIST = ${WRKDIR}/phonon-gstreamer-${VERSION}
+RUN_DEPENDS = multimedia/gstreamer1/plugins-good \
+ multimedia/gstreamer1/plugins-libav \
+ x11/gtk+3,-guic
+
+LIB_DEPENDS = multimedia/gstreamer1/core \
+ multimedia/gstreamer1/plugins-base \
+ x11/qt5/qtx11extras
+
+CONFIGURE_ARGS = -DPHONON_BUILD_PHONON4QT5=On
.include <bsd.port.mk>
diff --git a/multimedia/phonon-backend/gstreamer/distinfo
b/multimedia/phonon-backend/gstreamer/distinfo
index f7b701aeea1..f5194b47622 100644
--- a/multimedia/phonon-backend/gstreamer/distinfo
+++ b/multimedia/phonon-backend/gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phonon-backend-gstreamer-4.9.1.tar.xz) =
P8ypyyhP8S3nCmX/wfhd348njNS6BgIeEWZqyL/7bqI=
-SIZE (phonon-backend-gstreamer-4.9.1.tar.xz) = 88460
+SHA256 (phonon-backend-gstreamer-4.10.0.tar.xz) =
xYcYNVIdAV7yrRJ2sfWDQNlGwpA0ZjN/MXC6w8WNYfI=
+SIZE (phonon-backend-gstreamer-4.10.0.tar.xz) = 98532
diff --git a/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
b/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
index 506b03807ad..160b1ab4016 100644
--- a/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
+++ b/multimedia/phonon-backend/gstreamer/patches/patch-CMakeLists_txt
@@ -5,13 +5,17 @@ LibXml2 is not needed to compile the gstreamer backend for
Phonon
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -54,9 +54,6 @@ macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is requi
+@@ -105,13 +105,6 @@ set_package_properties(GLIB2 PROPERTIES
find_package(GObject REQUIRED)
-find_package(LibXml2 REQUIRED)
--macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the
gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html"; TRUE)
+-set_package_properties(LibXml2 PROPERTIES
+- TYPE REQUIRED
+- DESCRIPTION "LibXml2"
+- PURPOSE "LibXml2 is required to compile the gstreamer backend for Phonon"
+- URL "http://xmlsoft.org/downloads.html";)
-
add_subdirectory(gstreamer)
- if(ECM_FOUND AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
diff --git a/multimedia/phonon-backend/gstreamer/pkg/DESCR-main
b/multimedia/phonon-backend/gstreamer/pkg/DESCR
similarity index 100%
rename from multimedia/phonon-backend/gstreamer/pkg/DESCR-main
rename to multimedia/phonon-backend/gstreamer/pkg/DESCR
diff --git a/multimedia/phonon-backend/gstreamer/pkg/DESCR-icons
b/multimedia/phonon-backend/gstreamer/pkg/DESCR-icons
deleted file mode 100644
index e18b4bbfdcf..00000000000
--- a/multimedia/phonon-backend/gstreamer/pkg/DESCR-icons
+++ /dev/null
@@ -1,2 +0,0 @@
-Common icons for both Qt4- and Qt5-based versions of GStreamer plugin
-for Phonon, KDE multimedia layer.
diff --git a/multimedia/phonon-backend/gstreamer/pkg/PFRAG.no-qt5-main
b/multimedia/phonon-backend/gstreamer/pkg/PFRAG.no-qt5-main
deleted file mode 100644
index ef17125ef61..00000000000
--- a/multimedia/phonon-backend/gstreamer/pkg/PFRAG.no-qt5-main
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PFRAG.no-qt5-main,v 1.1 2016/05/27 02:44:00 zhuk Exp $
-lib/kde4/plugins/
-share/kde4/
-share/kde4/services/
-share/kde4/services/phononbackends/
-share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/multimedia/phonon-backend/gstreamer/pkg/PLIST
b/multimedia/phonon-backend/gstreamer/pkg/PLIST
new file mode 100644
index 00000000000..a114aaca802
--- /dev/null
+++ b/multimedia/phonon-backend/gstreamer/pkg/PLIST
@@ -0,0 +1,84 @@
+@comment $OpenBSD: PLIST,v$
+@conflict phonon-gstreamer-<4.10
+@conflict phonon-qt5-gstreamer-<4.10
+@conflict phonon-gstreamer-icons-*
+@pkgpath multimedia/phonon-backend/gstreamer,qt5,-main
+@pkgpath multimedia/phonon-backend/gstreamer,-icons
+@pkgpath multimedia/phonon-backend/gstreamer,-icons,qt5
+lib/qt5/
+lib/qt5/plugins/
+lib/qt5/plugins/phonon4qt5_backend/
+@so lib/qt5/plugins/phonon4qt5_backend/phonon_gstreamer.so
+share/icons/hicolor/128x128/apps/phonon-gstreamer.png
+share/icons/hicolor/16x16/apps/phonon-gstreamer.png
+share/icons/hicolor/22x22/apps/phonon-gstreamer.png
+share/icons/hicolor/48x48/apps/phonon-gstreamer.png
+share/icons/hicolor/64x64/apps/phonon-gstreamer.png
+share/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+share/locale/ar/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ast/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/bg/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/bs/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ca/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ca@valencia/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/cs/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/da/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/de/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/el/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/en_GB/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/eo/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/es/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/et/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/eu/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/fi/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/fr/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ga/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/gl/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/he/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/hr/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/hsb/
+share/locale/hsb/LC_MESSAGES/
+share/locale/hsb/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/hu/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/id/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/is/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/it/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ja/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/kk/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ko/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/lt/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/lv/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/mai/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/mr/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/nb/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/nds/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/nl/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/nn/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/pa/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/pl/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/pt/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/pt_BR/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ro/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ru/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/se/
+share/locale/se/LC_MESSAGES/
+share/locale/se/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sk/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sl/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sq/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sr/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
+share/locale/sr@ijekavian/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sr@latin/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/sv/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/th/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/tr/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/ug/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/uk/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/zh_CN/LC_MESSAGES/phonon_gstreamer_qt.qm
+share/locale/zh_TW/LC_MESSAGES/phonon_gstreamer_qt.qm
+@tag gtk-update-icon-cache %D/share/icons/hicolor
diff --git a/multimedia/phonon-backend/gstreamer/pkg/PLIST-icons
b/multimedia/phonon-backend/gstreamer/pkg/PLIST-icons
deleted file mode 100644
index 3e40ad19620..00000000000
--- a/multimedia/phonon-backend/gstreamer/pkg/PLIST-icons
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $OpenBSD: PLIST-icons,v 1.3 2018/06/29 22:16:18 espie Exp $
-@conflict phonon-gstreamer-<4.8.2p2
-@conflict phonon-qt5-gstreamer-<4.8.2p2
-share/icons/hicolor/128x128/apps/phonon-gstreamer.png
-share/icons/hicolor/16x16/apps/phonon-gstreamer.png
-share/icons/hicolor/22x22/apps/phonon-gstreamer.png
-share/icons/hicolor/48x48/apps/phonon-gstreamer.png
-share/icons/hicolor/64x64/apps/phonon-gstreamer.png
-share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
-@tag gtk-update-icon-cache %D/share/icons/hicolor
diff --git a/multimedia/phonon-backend/gstreamer/pkg/PLIST-main
b/multimedia/phonon-backend/gstreamer/pkg/PLIST-main
deleted file mode 100644
index 8f360c25eef..00000000000
--- a/multimedia/phonon-backend/gstreamer/pkg/PLIST-main
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2016/05/27 02:44:00 zhuk Exp $
-!%%qt5%%
-${BACKEND_DIR}/
-${BACKEND_DIR}/phonon_gstreamer.so
diff --git a/multimedia/phonon-backend/vlc/Makefile
b/multimedia/phonon-backend/vlc/Makefile
index 02f64ceb958..764ee80b0fe 100644
--- a/multimedia/phonon-backend/vlc/Makefile
+++ b/multimedia/phonon-backend/vlc/Makefile
@@ -1,28 +1,18 @@
# $OpenBSD: Makefile,v 1.10 2020/06/13 16:22:52 rsadowski Exp $
COMMENT = VLC-based Phonon backend
-VERSION = 0.10.3
+VERSION = 0.11.1
DISTNAME = phonon-backend-vlc-${VERSION}
-MASTER_SITES =
https://download.kde.org/stable/phonon/phonon-backend-vlc/${VERSION}/
+MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/phonon-backend-vlc/${VERSION}/}
+EXTRACT_SUFX = .tar.xz
-WANTLIB += ${COMPILER_LIBCXX} m vlc vlccore
+MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools
LIB_DEPENDS = x11/vlc>=2
-FLAVORS = qt5
-FLAVOR = qt5
-
-.if ${FLAVOR:Mqt5}
-WANTLIB += Qt5Core Qt5Gui Qt5Widgets
-.else
-WANTLIB += QtGui
-.endif
-
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/phonon-vlc-${VERSION}
-
.include <bsd.port.mk>
diff --git a/multimedia/phonon-backend/vlc/distinfo
b/multimedia/phonon-backend/vlc/distinfo
index 965bcf70a13..fea551fb3fe 100644
--- a/multimedia/phonon-backend/vlc/distinfo
+++ b/multimedia/phonon-backend/vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phonon-backend-vlc-0.10.3.tar.xz) =
/VA5MpAmM8JjM/H3jSQ7sgHHhVo1+M+TUgTfy1UMOdI=
-SIZE (phonon-backend-vlc-0.10.3.tar.xz) = 66488
+SHA256 (phonon-backend-vlc-0.11.1.tar.xz) =
zNkeln+UO54tehEVzR4oUbafaT1WjSF0v3CalEoU5e4=
+SIZE (phonon-backend-vlc-0.11.1.tar.xz) = 65064
diff --git
a/multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
b/multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
deleted file mode 100644
index f2bd5737310..00000000000
--- a/multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_video_videodataoutput_cpp,v 1.1 2018/10/19 20:53:27
rsadowski Exp $
-
-Index: src/video/videodataoutput.cpp
---- src/video/videodataoutput.cpp.orig
-+++ src/video/videodataoutput.cpp
-@@ -138,16 +138,16 @@ static const vlc_chroma_description_t *setFormat(Video
- *chroma = 0;
- return 0;
- case VideoFrame2::Format_RGB32:
-- qstrcpy(*chroma, "RV32");
-+ strcpy(*chroma, "RV32");
- return vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB32);
- case VideoFrame2::Format_RGB888:
-- qstrcpy(*chroma, "RV24");
-+ strcpy(*chroma, "RV24");
- return vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB24);
- case VideoFrame2::Format_YV12:
-- qstrcpy(*chroma, "YV12");
-+ strcpy(*chroma, "YV12");
- return vlc_fourcc_GetChromaDescription(VLC_CODEC_YV12);
- case VideoFrame2::Format_YUY2:
-- qstrcpy(*chroma, "YUY2");
-+ strcpy(*chroma, "YUY2");
- return vlc_fourcc_GetChromaDescription(VLC_CODEC_YUYV);
- }
- return 0;
diff --git
a/multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
b/multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
deleted file mode 100644
index 14d46616dcb..00000000000
--- a/multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_video_videowidget_cpp,v 1.1 2018/10/19 20:53:27 rsadowski
Exp $
-
-Index: src/video/videowidget.cpp
---- src/video/videowidget.cpp.orig
-+++ src/video/videowidget.cpp
-@@ -89,7 +89,7 @@ class SurfacePainter : public VideoMemoryStream (priva
- unsigned *pitches,
- unsigned *lines)
- {
-- qstrcpy(chroma, "RV32");
-+ strcpy(chroma, "RV32");
- unsigned bufferSize =
setPitchAndLines(vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB32),
- *width, *height,
- pitches, lines);
diff --git a/multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
b/multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
deleted file mode 100644
index 14a4e8efb09..00000000000
--- a/multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.no-qt5,v 1.1 2018/10/19 20:53:27 rsadowski Exp $
-share/kde4/
-share/kde4/services/
-share/kde4/services/phononbackends/
-share/kde4/services/phononbackends/vlc.desktop
diff --git a/multimedia/phonon-backend/vlc/pkg/PLIST
b/multimedia/phonon-backend/vlc/pkg/PLIST
index bec6a55c307..1f93e366425 100644
--- a/multimedia/phonon-backend/vlc/pkg/PLIST
+++ b/multimedia/phonon-backend/vlc/pkg/PLIST
@@ -1,4 +1,84 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/09/01 18:56:40 rsadowski Exp $
-lib/kde4/plugins/
-${BACKEND_DIR}/
-${BACKEND_DIR}/phonon_vlc.so
+@comment $OpenBSD: PLIST,v$
+@conflict phonon-vlc-<=0.10.3
+@conflict phonon-qt5-vlc-<0.11
+@pkgpath multimedia/phonon-backend/vlc,qt5
+lib/qt5/
+lib/qt5/plugins/
+lib/qt5/plugins/phonon4qt5_backend/
+@so lib/qt5/plugins/phonon4qt5_backend/phonon_vlc.so
+share/locale/
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
+share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
+share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
+share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
+share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
+share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/id/
+share/locale/id/LC_MESSAGES/
+share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
+share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
+share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/nn/
+share/locale/nn/LC_MESSAGES/
+share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
+share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sk/
+share/locale/sk/LC_MESSAGES/
+share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
+share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
+share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sr@latin/
+share/locale/sr@latin/LC_MESSAGES/
+share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
+share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
+share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
diff --git a/multimedia/phonon-qt5/Makefile b/multimedia/phonon-qt5/Makefile
deleted file mode 100644
index 183457d224a..00000000000
--- a/multimedia/phonon-qt5/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $OpenBSD: Makefile,v 1.8 2020/03/31 04:45:01 rsadowski Exp $
-
-COMMENT = multimedia layer for Qt5/KDE5
-VERSION = 4.10.3
-DISTNAME = phonon-${VERSION}
-PKGNAME = phonon-qt5-${VERSION}
-REVISION = 0
-
-# XXX major should be tweaked on any update, to unbreak
-# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 3.0
-SHARED_LIBS += phonon4qt5experimental 3.0
-
-CATEGORIES = multimedia devel
-HOMEPAGE = https://community.kde.org/Phonon
-
-MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
-
-# LGPL v2.1
-PERMIT_PACKAGE = Yes
-
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Widgets
-WANTLIB += m pulse pulse-mainloop-glib
-
-MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/}
-
-MODULES = devel/kf5
-
-LIB_DEPENDS = audio/pulseaudio
-BUILD_DEPENDS = x11/qt5/qtdeclarative
-RUN_DEPENDS = x11/qt5/qtdeclarative
-
-PHONON_INCLUDE_DIR = include/phonon4qt5
-
-# Clashes with the one provided by Qt itself.
-CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF \
- -DPHONON_INSTALL_QT_COMPAT_HEADERS=OFF
-
-CONFIGURE_ARGS += -DPHONON_BUILD_PHONON4QT5=ON \
- -DINCLUDE_INSTALL_DIR=${PHONON_INCLUDE_DIR} \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
-
-SUBST_VARS = PHONON_INCLUDE_DIR
-
-.include <bsd.port.mk>
diff --git a/multimedia/phonon-qt5/distinfo b/multimedia/phonon-qt5/distinfo
deleted file mode 100644
index 1d8b70ff3e0..00000000000
--- a/multimedia/phonon-qt5/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (phonon-4.10.3.tar.xz) = LosUVmmvoOk4M+QGS2V2d6vJQT5AB/pd3JE5fJvdwpU=
-SIZE (phonon-4.10.3.tar.xz) = 336724
diff --git a/multimedia/phonon-qt5/patches/patch-CMakeLists_txt
b/multimedia/phonon-qt5/patches/patch-CMakeLists_txt
deleted file mode 100644
index 9c89e3175a9..00000000000
--- a/multimedia/phonon-qt5/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/07/17 21:06:37 zhuk Exp $
-
-Adapt to current Qt.
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -78,9 +78,9 @@ else (NOT PHONON_BUILD_PHONON4QT5) # Qt 5
- set(QT_QTOPENGL_FOUND ${Qt5OpenGL_FOUND})
-
- # Declarative/QML1
-- find_package(Qt5Declarative)
-- macro_log_feature(Qt5Declarative_FOUND "Qt5 Declarative (qtquick1)"
${DECL_DESC} "http://www.qt.gitorious.net/qt/qtquick1"; FALSE)
-- set(QT_QTDECLARATIVE_FOUND ${Qt5Declarative_FOUND})
-+ find_package(Qt5Quick)
-+ macro_log_feature(Qt5Quick_FOUND "Qt5 Quick (qtquick1)" ${DECL_DESC}
"http://www.qt.gitorious.net/qt/qtquick1"; FALSE)
-+ set(QT_QTDECLARATIVE_FOUND ${Qt5Quick_FOUND})
-
- set(PHONON_PKG_DEPENDENCIES "Qt5Core Qt5Gui Qt5DBus")
- endif (NOT PHONON_BUILD_PHONON4QT5)
diff --git a/multimedia/phonon-qt5/patches/patch-cmake_CMakeLists_txt
b/multimedia/phonon-qt5/patches/patch-cmake_CMakeLists_txt
deleted file mode 100644
index cb3373e676f..00000000000
--- a/multimedia/phonon-qt5/patches/patch-cmake_CMakeLists_txt
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-cmake_CMakeLists_txt,v 1.1.1.1 2017/07/17 21:06:37 zhuk Exp $
-Skip installing files we already have in either CMake base
-installation or somewhere else.
---- cmake/CMakeLists.txt.orig Tue Jan 24 08:29:17 2017
-+++ cmake/CMakeLists.txt Sun Mar 26 17:30:40 2017
-@@ -1,11 +1,9 @@
- install(FILES cmake_uninstall.cmake.in
- COPYING-CMAKE-SCRIPTS
-- FindPackageHandleStandardArgs.cmake
- FindPhononInternal.cmake
- MacroEnsureVersion.cmake
- MacroLogFeature.cmake
- MacroOptionalFindPackage.cmake
-- MacroPushRequiredVars.cmake
- PhononMacros.cmake
- PhononQt4.cmake
- PhononQt5.cmake
diff --git a/multimedia/phonon-qt5/patches/patch-cmake_FindPhononInternal_cmake
b/multimedia/phonon-qt5/patches/patch-cmake_FindPhononInternal_cmake
deleted file mode 100644
index 6eea8522fca..00000000000
--- a/multimedia/phonon-qt5/patches/patch-cmake_FindPhononInternal_cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.1.1.1 2017/07/17 21:06:37
zhuk Exp $
-Allow paths to be overriden.
-Also, make sure that subdirectory paths do not expand to absolute ones
automatically.
---- cmake/FindPhononInternal.cmake.orig Sun Mar 26 23:03:05 2017
-+++ cmake/FindPhononInternal.cmake Sun Mar 26 23:05:34 2017
-@@ -64,20 +64,20 @@ include(${phonon_cmake_module_dir}/MacroEnsureVersion.
-
- include(GNUInstallDirs)
-
--set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATAROOTDIR}") #
CACHE PATH "Base directory for files which go to share/")
--set(INCLUDE_INSTALL_DIR "include" ) # CACHE PATH "The
subdirectory to the header prefix")
-+set(BIN_INSTALL_DIR "bin" CACHE STRING "The install
dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
-+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "The
subdirectory relative to the install prefix where libraries will be installed")
-+set(SHARE_INSTALL_PREFIX "share" CACHE STRING "Base
directory for files which go to share/")
- if (PHONON_BUILD_PHONON4QT5)
-- set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" ) #
CACHE PATH "The subdirectory to the header prefix")
--endif (PHONON_BUILD_PHONON4QT5)
--set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install
dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
--set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH
"The subdirectory relative to the install prefix where libraries will be
installed"
--set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4"
CACHE PATH "The subdirectory relative to the install prefix where plugins will
be installed (default is ${LIB_INSTALL_DIR}/kde4)")
--if (PHONON_BUILD_PHONON4QT5)
-- set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5"
CACHE PATH "The subdirectory relative to the install prefix where plugins will
be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
--endif(PHONON_BUILD_PHONON4QT5)
--set(BACKEND_INSTALL_DIR
"${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend")
-+ set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}"
CACHE STRING "The subdirectory to the header prefix")
-+ set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5"
CACHE STRING "The subdirectory relative to the install prefix where plugins
will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
-+else ()
-+ set(INCLUDE_INSTALL_DIR "include" CACHE STRING "The
subdirectory to the header prefix")
-+ set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4"
CACHE STRING "The subdirectory relative to the install prefix where plugins
will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-+endif ()
- if(WIN32) # Imported from Phonon VLC
- set(BACKEND_INSTALL_DIR "bin/${PHONON_LIB_SONAME}_backend")
-+else ()
-+ set(BACKEND_INSTALL_DIR
"${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend")
- endif()
- set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons"
CACHE PATH "The icon install dir (default
${SHARE_INSTALL_PREFIX}/share/icons/)")
- set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services"
CACHE PATH "The install dir for service (desktop, protocol, ...) files")
diff --git a/multimedia/phonon-qt5/patches/patch-phonon_CMakeLists_txt
b/multimedia/phonon-qt5/patches/patch-phonon_CMakeLists_txt
deleted file mode 100644
index e49c3f0bf9f..00000000000
--- a/multimedia/phonon-qt5/patches/patch-phonon_CMakeLists_txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-phonon_CMakeLists_txt,v 1.2 2019/09/01 18:55:12 rsadowski Exp $
-Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
-due to changing "-I/usr/local/include/kde4" to
-"-isystem /usr/local/include/kde4".
-Index: phonon/CMakeLists.txt
---- phonon/CMakeLists.txt.orig
-+++ phonon/CMakeLists.txt
-@@ -176,8 +176,6 @@ set_target_properties(${PHONON_LIB_SONAME} PROPERTIES
- # This reduces inter-package dependencies and makes it easier to remove
- # dependencies of shared libraries without breaking binary compatibility.
-
--target_include_directories(${PHONON_LIB_SONAME}
-- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-
- install(TARGETS ${PHONON_LIB_SONAME} EXPORT PhononLibs
${INSTALL_TARGETS_DEFAULT_ARGS} )
-
diff --git
a/multimedia/phonon-qt5/patches/patch-phonon_experimental_CMakeLists_txt
b/multimedia/phonon-qt5/patches/patch-phonon_experimental_CMakeLists_txt
deleted file mode 100644
index 66e20445d1f..00000000000
--- a/multimedia/phonon-qt5/patches/patch-phonon_experimental_CMakeLists_txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-phonon_experimental_CMakeLists_txt,v 1.1.1.1 2017/07/17
21:06:37 zhuk Exp $
-Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
-due to changing "-I/usr/local/include/kde4" to
-"-isystem /usr/local/include/kde4".
---- phonon/experimental/CMakeLists.txt.orig Tue Jan 24 08:29:17 2017
-+++ phonon/experimental/CMakeLists.txt Sun Mar 26 17:31:40 2017
-@@ -29,8 +29,6 @@ set_target_properties(${PHONON_LIB_SONAME}experimental
- LINK_INTERFACE_LIBRARIES ""
- )
- install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT
PhononExperimentalLibs ${INSTALL_TARGETS_DEFAULT_ARGS})
--target_include_directories(${PHONON_LIB_SONAME}experimental
-- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-
- ########### install headers ###############
- install(FILES
diff --git a/multimedia/phonon-qt5/pkg/DESCR b/multimedia/phonon-qt5/pkg/DESCR
deleted file mode 100644
index 433be81337d..00000000000
--- a/multimedia/phonon-qt5/pkg/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Phonon is the multimedia framework for KDE.
-
-Phonon uses backend plugins to access different providers, see
-ports in multimedia/phonon-backend. At least one of the backend
-plugins should be installed.
-
-This is the Qt5-based version.
diff --git a/multimedia/phonon-qt5/pkg/PLIST b/multimedia/phonon-qt5/pkg/PLIST
deleted file mode 100644
index 683eef29668..00000000000
--- a/multimedia/phonon-qt5/pkg/PLIST
+++ /dev/null
@@ -1,226 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/09/01 18:55:12 rsadowski Exp $
-@pkgpath multimedia/phonon,qt5
-${PHONON_INCLUDE_DIR}/
-${PHONON_INCLUDE_DIR}/KDE/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractAudioOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractMediaStream
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractVideoOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AddonInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioDevice
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioDeviceEnumerator
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputDevice
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputDeviceModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/BackendCapabilities
-${PHONON_INCLUDE_DIR}/KDE/Phonon/BackendInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Effect
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectDescription
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectDescriptionModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectParameter
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectWidget
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/AbstractVideoDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/AudioDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/SnapshotInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoDataOutputInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoFrame
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoFrame2
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/Visualization
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Global
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaController
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaNode
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaObject
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaObjectInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaSource
-${PHONON_INCLUDE_DIR}/KDE/Phonon/ObjectDescription
-${PHONON_INCLUDE_DIR}/KDE/Phonon/ObjectDescriptionModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Path
-${PHONON_INCLUDE_DIR}/KDE/Phonon/PlatformPlugin
-${PHONON_INCLUDE_DIR}/KDE/Phonon/SeekSlider
-${PHONON_INCLUDE_DIR}/KDE/Phonon/StreamInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoPlayer
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoWidget
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoWidgetInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeFaderEffect
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeFaderInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeSlider
-${PHONON_INCLUDE_DIR}/phonon/
-${PHONON_INCLUDE_DIR}/phonon/AbstractAudioOutput
-${PHONON_INCLUDE_DIR}/phonon/AbstractMediaStream
-${PHONON_INCLUDE_DIR}/phonon/AbstractVideoOutput
-${PHONON_INCLUDE_DIR}/phonon/AddonInterface
-${PHONON_INCLUDE_DIR}/phonon/AudioCaptureDevice
-${PHONON_INCLUDE_DIR}/phonon/AudioCaptureDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/AudioChannelDescription
-${PHONON_INCLUDE_DIR}/phonon/AudioChannelDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/AudioDataOutput
-${PHONON_INCLUDE_DIR}/phonon/AudioOutput
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputDevice
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface40
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface42
-${PHONON_INCLUDE_DIR}/phonon/AvCapture
-${PHONON_INCLUDE_DIR}/phonon/BackendCapabilities
-${PHONON_INCLUDE_DIR}/phonon/BackendInterface
-${PHONON_INCLUDE_DIR}/phonon/Effect
-${PHONON_INCLUDE_DIR}/phonon/EffectDescription
-${PHONON_INCLUDE_DIR}/phonon/EffectDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/EffectInterface
-${PHONON_INCLUDE_DIR}/phonon/EffectParameter
-${PHONON_INCLUDE_DIR}/phonon/EffectWidget
-${PHONON_INCLUDE_DIR}/phonon/Global
-${PHONON_INCLUDE_DIR}/phonon/GlobalDescriptionContainer
-${PHONON_INCLUDE_DIR}/phonon/MediaController
-${PHONON_INCLUDE_DIR}/phonon/MediaNode
-${PHONON_INCLUDE_DIR}/phonon/MediaObject
-${PHONON_INCLUDE_DIR}/phonon/MediaObjectInterface
-${PHONON_INCLUDE_DIR}/phonon/MediaSource
-${PHONON_INCLUDE_DIR}/phonon/Mrl
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescription
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionData
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionModelData
-${PHONON_INCLUDE_DIR}/phonon/Path
-${PHONON_INCLUDE_DIR}/phonon/PlatformPlugin
-${PHONON_INCLUDE_DIR}/phonon/SeekSlider
-${PHONON_INCLUDE_DIR}/phonon/StreamInterface
-${PHONON_INCLUDE_DIR}/phonon/SubtitleDescription
-${PHONON_INCLUDE_DIR}/phonon/SubtitleDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/VideoCaptureDevice
-${PHONON_INCLUDE_DIR}/phonon/VideoCaptureDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/VideoPlayer
-${PHONON_INCLUDE_DIR}/phonon/VideoWidget
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterface
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterface44
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterfaceLatest
-${PHONON_INCLUDE_DIR}/phonon/VolumeFaderEffect
-${PHONON_INCLUDE_DIR}/phonon/VolumeFaderInterface
-${PHONON_INCLUDE_DIR}/phonon/VolumeSlider
-${PHONON_INCLUDE_DIR}/phonon/abstractaudiooutput.h
-${PHONON_INCLUDE_DIR}/phonon/abstractmediastream.h
-${PHONON_INCLUDE_DIR}/phonon/abstractvideooutput.h
-${PHONON_INCLUDE_DIR}/phonon/addoninterface.h
-${PHONON_INCLUDE_DIR}/phonon/audiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/audiodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/audiooutput.h
-${PHONON_INCLUDE_DIR}/phonon/audiooutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/backendcapabilities.h
-${PHONON_INCLUDE_DIR}/phonon/backendinterface.h
-${PHONON_INCLUDE_DIR}/phonon/effect.h
-${PHONON_INCLUDE_DIR}/phonon/effectinterface.h
-${PHONON_INCLUDE_DIR}/phonon/effectparameter.h
-${PHONON_INCLUDE_DIR}/phonon/effectwidget.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/
-${PHONON_INCLUDE_DIR}/phonon/experimental/abstractaudiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/abstractvideodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audiodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audioformat.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/avcapture.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/avcaptureinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/backendcapabilities.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/backendinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/export.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/globalconfig.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/mediasource.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/objectdescription.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/packet.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/packetpool.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/phononnamespace.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/snapshotinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutput2.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videoframe.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videoframe2.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videowidget.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/visualization.h
-${PHONON_INCLUDE_DIR}/phonon/globalconfig.h
-${PHONON_INCLUDE_DIR}/phonon/globaldescriptioncontainer.h
-${PHONON_INCLUDE_DIR}/phonon/mediacontroller.h
-${PHONON_INCLUDE_DIR}/phonon/medianode.h
-${PHONON_INCLUDE_DIR}/phonon/mediaobject.h
-${PHONON_INCLUDE_DIR}/phonon/mediaobjectinterface.h
-${PHONON_INCLUDE_DIR}/phonon/mediasource.h
-${PHONON_INCLUDE_DIR}/phonon/mrl.h
-${PHONON_INCLUDE_DIR}/phonon/objectdescription.h
-${PHONON_INCLUDE_DIR}/phonon/objectdescriptionmodel.h
-${PHONON_INCLUDE_DIR}/phonon/path.h
-${PHONON_INCLUDE_DIR}/phonon/phonon_export.h
-${PHONON_INCLUDE_DIR}/phonon/phonondefs.h
-${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h
-${PHONON_INCLUDE_DIR}/phonon/platformplugin.h
-${PHONON_INCLUDE_DIR}/phonon/pulsesupport.h
-${PHONON_INCLUDE_DIR}/phonon/seekslider.h
-${PHONON_INCLUDE_DIR}/phonon/streaminterface.h
-${PHONON_INCLUDE_DIR}/phonon/videoplayer.h
-${PHONON_INCLUDE_DIR}/phonon/videowidget.h
-${PHONON_INCLUDE_DIR}/phonon/videowidgetinterface.h
-${PHONON_INCLUDE_DIR}/phonon/volumefadereffect.h
-${PHONON_INCLUDE_DIR}/phonon/volumefaderinterface.h
-${PHONON_INCLUDE_DIR}/phonon/volumeslider.h
-lib/cmake/phonon4qt5/
-lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake
-lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
-lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/phonon4qt5/PhononTargets.cmake
-@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
-@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
-lib/pkgconfig/phonon4qt5.pc
-lib/qt5/mkspecs/modules/qt_phonon4qt5.pri
-share/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
-share/locale/ca/LC_MESSAGES/libphonon_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/libphonon_qt.qm
-share/locale/cs/LC_MESSAGES/libphonon_qt.qm
-share/locale/de/LC_MESSAGES/libphonon_qt.qm
-share/locale/en_GB/LC_MESSAGES/libphonon_qt.qm
-share/locale/es/LC_MESSAGES/libphonon_qt.qm
-share/locale/eu/LC_MESSAGES/libphonon_qt.qm
-share/locale/fi/LC_MESSAGES/libphonon_qt.qm
-share/locale/fr/LC_MESSAGES/libphonon_qt.qm
-share/locale/gl/LC_MESSAGES/libphonon_qt.qm
-share/locale/id/LC_MESSAGES/libphonon_qt.qm
-share/locale/is/LC_MESSAGES/libphonon_qt.qm
-share/locale/it/LC_MESSAGES/libphonon_qt.qm
-share/locale/ja/LC_MESSAGES/libphonon_qt.qm
-share/locale/ko/LC_MESSAGES/libphonon_qt.qm
-share/locale/nb/LC_MESSAGES/libphonon_qt.qm
-share/locale/nl/LC_MESSAGES/libphonon_qt.qm
-share/locale/nn/LC_MESSAGES/libphonon_qt.qm
-share/locale/pl/LC_MESSAGES/libphonon_qt.qm
-share/locale/pt_BR/LC_MESSAGES/libphonon_qt.qm
-share/locale/se/
-share/locale/se/LC_MESSAGES/
-share/locale/se/LC_MESSAGES/libphonon_qt.qm
-share/locale/sk/LC_MESSAGES/libphonon_qt.qm
-share/locale/sr/LC_MESSAGES/libphonon_qt.qm
-share/locale/sr@ijekavian/
-share/locale/sr@ijekavian/LC_MESSAGES/
-share/locale/sr@ijekavian/LC_MESSAGES/libphonon_qt.qm
-share/locale/sr@ijekavianlatin/
-share/locale/sr@ijekavianlatin/LC_MESSAGES/
-share/locale/sr@ijekavianlatin/LC_MESSAGES/libphonon_qt.qm
-share/locale/sr@latin/LC_MESSAGES/libphonon_qt.qm
-share/locale/sv/LC_MESSAGES/libphonon_qt.qm
-share/locale/uk/LC_MESSAGES/libphonon_qt.qm
-share/locale/zh_CN/LC_MESSAGES/libphonon_qt.qm
-share/phonon4qt5/
-share/phonon4qt5/buildsystem/
-share/phonon4qt5/buildsystem/COPYING-CMAKE-SCRIPTS
-share/phonon4qt5/buildsystem/FindPhononInternal.cmake
-share/phonon4qt5/buildsystem/MacroEnsureVersion.cmake
-share/phonon4qt5/buildsystem/MacroLogFeature.cmake
-share/phonon4qt5/buildsystem/MacroOptionalFindPackage.cmake
-share/phonon4qt5/buildsystem/PhononMacros.cmake
-share/phonon4qt5/buildsystem/PhononQt4.cmake
-share/phonon4qt5/buildsystem/PhononQt5.cmake
-share/phonon4qt5/buildsystem/cmake_uninstall.cmake.in
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 93eb715e88f..087191ebf84 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,47 +1,38 @@
-# $OpenBSD: Makefile,v 1.28 2020/03/31 04:43:59 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.8 2020/03/31 04:45:01 rsadowski Exp $
+
+COMMENT = multimedia layer for Qt5/KDE5
-COMMENT = multimedia layer for Qt4/KDE4
CATEGORIES = multimedia devel
-VERSION = 4.10.3
+
+VERSION = 4.11.1
DISTNAME = phonon-${VERSION}
-HOMEPAGE = https://community.kde.org/Phonon
-REVISION = 0
-# The phonon_s* are for KDE4-only, renamed to avoid clashing with Qt4's one
# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS = phonon_s 4.0
-SHARED_LIBS += phonon_sexperimental 3.0
+SHARED_LIBS += phonon4qt5 4.0
+SHARED_LIBS += phonon4qt5experimental 4.0
+
+HOMEPAGE = https://community.kde.org/Phonon
MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
# LGPL v2.1
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} QtDBus QtGui m pulse pulse-mainloop-glib
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m pulse
+WANTLIB += pulse-mainloop-glib
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/}
-EXTRACT_SUFX = .tar.xz
+
+MODULES = devel/kf5
LIB_DEPENDS = audio/pulseaudio
-MODULES = x11/kde4
-MODKDE4_USE =
-MODKDE4_LIB_LINKS = Yes
-PHONON_INCLUDE_DIR = ${MODKDE4_INCLUDE_DIR}
+BUILD_DEPENDS = x11/qt5/qtdeclarative
-# Not sure if it's needed at all but doesn't hurt either for now.
-CONFIGURE_ARGS = -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+RUN_DEPENDS = x11/qt5/qtdeclarative
# Clashes with the one provided by Qt itself.
-CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF \
- -DPHONON_INSTALL_QT_COMPAT_HEADERS=OFF
-
-CONFIGURE_ARGS +=
-DBACKEND_INSTALL_DIR="${PREFIX}/lib/kde4/plugins/phonon_backend" \
- -DINCLUDE_INSTALL_DIR=${PHONON_INCLUDE_DIR} \
-
-NO_TEST = Yes
-
-SUBST_VARS = PHONON_INCLUDE_DIR
+CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
.include <bsd.port.mk>
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 1d8b70ff3e0..38cc031f6a2 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phonon-4.10.3.tar.xz) = LosUVmmvoOk4M+QGS2V2d6vJQT5AB/pd3JE5fJvdwpU=
-SIZE (phonon-4.10.3.tar.xz) = 336724
+SHA256 (phonon-4.11.1.tar.xz) = tEMeomAN+BN6cXdBrZ68f37BZJ+j4ThUHY9CWXFE3i0=
+SIZE (phonon-4.11.1.tar.xz) = 314732
diff --git a/multimedia/phonon/patches/patch-CMakeLists_txt
b/multimedia/phonon/patches/patch-CMakeLists_txt
deleted file mode 100644
index 2077a9c0d63..00000000000
--- a/multimedia/phonon/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.7 2019/09/01 18:54:54 rsadowski Exp $
-Rename library to avoid clashing with Qt4's one.
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -26,7 +26,7 @@ set(PHONON_LIB_MINOR_VERSION "10") # Only change on bi
- set(PHONON_LIB_PATCH_VERSION "3") # Bump whenever you feel like it :P
- set(PHONON_LIB_VERSION
"${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}")
- set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION})
--set(PHONON_LIB_SONAME phonon)
-+set(PHONON_LIB_SONAME phonon_s)
- set(PHONON_LIB_SONAME_CAMEL Phonon)
-
- if(PHONON_BUILD_PHONON4QT5)
diff --git a/multimedia/phonon/patches/patch-cmake_CMakeLists_txt
b/multimedia/phonon/patches/patch-cmake_CMakeLists_txt
deleted file mode 100644
index b71d29b4be9..00000000000
--- a/multimedia/phonon/patches/patch-cmake_CMakeLists_txt
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-cmake_CMakeLists_txt,v 1.3 2018/10/19 20:53:27 rsadowski Exp $
-Skip installing files we already have in either CMake base
-installation or somewhere else.
-Index: cmake/CMakeLists.txt
---- cmake/CMakeLists.txt.orig
-+++ cmake/CMakeLists.txt
-@@ -1,12 +1,9 @@
- install(FILES cmake_uninstall.cmake.in
- COPYING-CMAKE-SCRIPTS
-- FindPackageHandleStandardArgs.cmake
- FindPhononInternal.cmake
- MacroEnsureVersion.cmake
- MacroLogFeature.cmake
- MacroOptionalFindPackage.cmake
-- MacroPushRequiredVars.cmake
- PhononMacros.cmake
- PhononQt4.cmake
-- PhononQt5.cmake
- DESTINATION ${BUILDSYSTEM_INSTALL_DIR})
diff --git a/multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake
b/multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake
deleted file mode 100644
index 0ef02ca0fb2..00000000000
--- a/multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.5 2018/10/19 20:53:27
rsadowski Exp $
-Allow paths to be overriden.
-Also, make sure that subdirectory paths do not expand to absolute ones
automatically.
---- cmake/FindPhononInternal.cmake.orig Sun Mar 26 23:03:05 2017
-+++ cmake/FindPhononInternal.cmake Sun Mar 26 23:05:34 2017
-@@ -64,20 +64,20 @@ include(${phonon_cmake_module_dir}/MacroEnsureVersion.
-
- include(GNUInstallDirs)
-
--set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATAROOTDIR}") #
CACHE PATH "Base directory for files which go to share/")
--set(INCLUDE_INSTALL_DIR "include" ) # CACHE PATH "The
subdirectory to the header prefix")
-+set(BIN_INSTALL_DIR "bin" CACHE STRING "The install
dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
-+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "The
subdirectory relative to the install prefix where libraries will be installed")
-+set(SHARE_INSTALL_PREFIX "share" CACHE STRING "Base
directory for files which go to share/")
- if (PHONON_BUILD_PHONON4QT5)
-- set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" ) #
CACHE PATH "The subdirectory to the header prefix")
--endif (PHONON_BUILD_PHONON4QT5)
--set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install
dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
--set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH
"The subdirectory relative to the install prefix where libraries will be
installed"
--set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4"
CACHE PATH "The subdirectory relative to the install prefix where plugins will
be installed (default is ${LIB_INSTALL_DIR}/kde4)")
--if (PHONON_BUILD_PHONON4QT5)
-- set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5"
CACHE PATH "The subdirectory relative to the install prefix where plugins will
be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
--endif(PHONON_BUILD_PHONON4QT5)
--set(BACKEND_INSTALL_DIR
"${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend")
-+ set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}"
CACHE STRING "The subdirectory to the header prefix")
-+ set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5"
CACHE STRING "The subdirectory relative to the install prefix where plugins
will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
-+else ()
-+ set(INCLUDE_INSTALL_DIR "include" CACHE STRING "The
subdirectory to the header prefix")
-+ set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4"
CACHE STRING "The subdirectory relative to the install prefix where plugins
will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-+endif ()
- if(WIN32) # Imported from Phonon VLC
- set(BACKEND_INSTALL_DIR "bin/${PHONON_LIB_SONAME}_backend")
-+else ()
-+ set(BACKEND_INSTALL_DIR
"${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend")
- endif()
- set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons"
CACHE PATH "The icon install dir (default
${SHARE_INSTALL_PREFIX}/share/icons/)")
- set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services"
CACHE PATH "The install dir for service (desktop, protocol, ...) files")
diff --git a/multimedia/phonon/patches/patch-phonon_CMakeLists_txt
b/multimedia/phonon/patches/patch-phonon_CMakeLists_txt
deleted file mode 100644
index 233434b279c..00000000000
--- a/multimedia/phonon/patches/patch-phonon_CMakeLists_txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-phonon_CMakeLists_txt,v 1.4 2019/09/01 18:54:54 rsadowski Exp $
-Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
-due to changing "-I/usr/local/include/kde4" to
-"-isystem /usr/local/include/kde4".
-Index: phonon/CMakeLists.txt
---- phonon/CMakeLists.txt.orig
-+++ phonon/CMakeLists.txt
-@@ -176,8 +176,6 @@ set_target_properties(${PHONON_LIB_SONAME} PROPERTIES
- # This reduces inter-package dependencies and makes it easier to remove
- # dependencies of shared libraries without breaking binary compatibility.
-
--target_include_directories(${PHONON_LIB_SONAME}
-- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-
- install(TARGETS ${PHONON_LIB_SONAME} EXPORT PhononLibs
${INSTALL_TARGETS_DEFAULT_ARGS} )
-
diff --git a/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
b/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
deleted file mode 100644
index 6550cc824bc..00000000000
--- a/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-phonon_experimental_CMakeLists_txt,v 1.2 2018/10/19 20:53:27
rsadowski Exp $
-Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
-due to changing "-I/usr/local/include/kde4" to
-"-isystem /usr/local/include/kde4".
-Index: phonon/experimental/CMakeLists.txt
---- phonon/experimental/CMakeLists.txt.orig
-+++ phonon/experimental/CMakeLists.txt
-@@ -29,8 +29,6 @@ set_target_properties(${PHONON_LIB_SONAME}experimental
- LINK_INTERFACE_LIBRARIES ""
- )
- install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT
PhononExperimentalLibs ${INSTALL_TARGETS_DEFAULT_ARGS})
--target_include_directories(${PHONON_LIB_SONAME}experimental
-- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-
- ########### install headers ###############
- install(FILES
diff --git a/multimedia/phonon/phonon.port.mk b/multimedia/phonon/phonon.port.mk
deleted file mode 100644
index 7455ba5290c..00000000000
--- a/multimedia/phonon/phonon.port.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: phonon.port.mk,v 1.10 2020/06/13 16:22:52 rsadowski Exp $
-.if ${MODULES:Mx11/qt5} || ${MODULES:Mdevel/kf5}
-MODPHONON_WANTLIB = phonon4qt5
-MODPHONON_LIB_DEPENDS = phonon-qt5->=4.10.1:multimedia/phonon-qt5
-.endif
-
-# If enabled (default), make sure at least one Phonon backend is
-# installed prior installing affected port.
-MODPHONON_PLUGIN_DEPS ?= Yes
-.if ${MODPHONON_PLUGIN_DEPS:L} == "yes"
-. if ${MODULES:Mx11/qt5} || ${MODULES:Mdevel/kf5}
-MODPHONON_RUN_DEPENDS =
phonon-qt5-gstreamer-*:multimedia/phonon-backend/gstreamer,qt5
-. endif
-.endif
-
-WANTLIB += ${MODPHONON_WANTLIB}
-LIB_DEPENDS += ${MODPHONON_LIB_DEPENDS}
-RUN_DEPENDS += ${MODPHONON_RUN_DEPENDS}
diff --git a/multimedia/phonon/pkg/DESCR b/multimedia/phonon/pkg/DESCR
index 4449080b528..7029953299a 100644
--- a/multimedia/phonon/pkg/DESCR
+++ b/multimedia/phonon/pkg/DESCR
@@ -1,7 +1,5 @@
-Phonon is the multimedia framework for KDE4.
+Phonon is the multimedia framework for KDE.
Phonon uses backend plugins to access different providers, see
ports in multimedia/phonon-backend. At least one of the backend
plugins should be installed.
-
-This is the Qt4-based version.
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index 8ac882c487b..9dcee829b4a 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -1,193 +1,237 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/10/19 20:53:27 rsadowski Exp $
-${PHONON_INCLUDE_DIR}/
-${PHONON_INCLUDE_DIR}/KDE/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractAudioOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractMediaStream
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AbstractVideoOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AddonInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioDevice
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioDeviceEnumerator
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputDevice
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputDeviceModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/AudioOutputInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/BackendCapabilities
-${PHONON_INCLUDE_DIR}/KDE/Phonon/BackendInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Effect
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectDescription
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectDescriptionModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectParameter
-${PHONON_INCLUDE_DIR}/KDE/Phonon/EffectWidget
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/AbstractVideoDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/AudioDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/SnapshotInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoDataOutput
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoDataOutputInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoFrame
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/VideoFrame2
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Experimental/Visualization
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Global
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaController
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaNode
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaObject
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaObjectInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/MediaSource
-${PHONON_INCLUDE_DIR}/KDE/Phonon/ObjectDescription
-${PHONON_INCLUDE_DIR}/KDE/Phonon/ObjectDescriptionModel
-${PHONON_INCLUDE_DIR}/KDE/Phonon/Path
-${PHONON_INCLUDE_DIR}/KDE/Phonon/PlatformPlugin
-${PHONON_INCLUDE_DIR}/KDE/Phonon/SeekSlider
-${PHONON_INCLUDE_DIR}/KDE/Phonon/StreamInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoPlayer
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoWidget
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VideoWidgetInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeFaderEffect
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeFaderInterface
-${PHONON_INCLUDE_DIR}/KDE/Phonon/VolumeSlider
-${PHONON_INCLUDE_DIR}/phonon/
-${PHONON_INCLUDE_DIR}/phonon/AbstractAudioOutput
-${PHONON_INCLUDE_DIR}/phonon/AbstractMediaStream
-${PHONON_INCLUDE_DIR}/phonon/AbstractVideoOutput
-${PHONON_INCLUDE_DIR}/phonon/AddonInterface
-${PHONON_INCLUDE_DIR}/phonon/AudioCaptureDevice
-${PHONON_INCLUDE_DIR}/phonon/AudioCaptureDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/AudioChannelDescription
-${PHONON_INCLUDE_DIR}/phonon/AudioChannelDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/AudioDataOutput
-${PHONON_INCLUDE_DIR}/phonon/AudioOutput
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputDevice
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface40
-${PHONON_INCLUDE_DIR}/phonon/AudioOutputInterface42
-${PHONON_INCLUDE_DIR}/phonon/AvCapture
-${PHONON_INCLUDE_DIR}/phonon/BackendCapabilities
-${PHONON_INCLUDE_DIR}/phonon/BackendInterface
-${PHONON_INCLUDE_DIR}/phonon/Effect
-${PHONON_INCLUDE_DIR}/phonon/EffectDescription
-${PHONON_INCLUDE_DIR}/phonon/EffectDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/EffectInterface
-${PHONON_INCLUDE_DIR}/phonon/EffectParameter
-${PHONON_INCLUDE_DIR}/phonon/EffectWidget
-${PHONON_INCLUDE_DIR}/phonon/Global
-${PHONON_INCLUDE_DIR}/phonon/GlobalDescriptionContainer
-${PHONON_INCLUDE_DIR}/phonon/MediaController
-${PHONON_INCLUDE_DIR}/phonon/MediaNode
-${PHONON_INCLUDE_DIR}/phonon/MediaObject
-${PHONON_INCLUDE_DIR}/phonon/MediaObjectInterface
-${PHONON_INCLUDE_DIR}/phonon/MediaSource
-${PHONON_INCLUDE_DIR}/phonon/Mrl
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescription
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionData
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/ObjectDescriptionModelData
-${PHONON_INCLUDE_DIR}/phonon/Path
-${PHONON_INCLUDE_DIR}/phonon/PlatformPlugin
-${PHONON_INCLUDE_DIR}/phonon/SeekSlider
-${PHONON_INCLUDE_DIR}/phonon/StreamInterface
-${PHONON_INCLUDE_DIR}/phonon/SubtitleDescription
-${PHONON_INCLUDE_DIR}/phonon/SubtitleDescriptionModel
-${PHONON_INCLUDE_DIR}/phonon/VideoCaptureDevice
-${PHONON_INCLUDE_DIR}/phonon/VideoCaptureDeviceModel
-${PHONON_INCLUDE_DIR}/phonon/VideoPlayer
-${PHONON_INCLUDE_DIR}/phonon/VideoWidget
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterface
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterface44
-${PHONON_INCLUDE_DIR}/phonon/VideoWidgetInterfaceLatest
-${PHONON_INCLUDE_DIR}/phonon/VolumeFaderEffect
-${PHONON_INCLUDE_DIR}/phonon/VolumeFaderInterface
-${PHONON_INCLUDE_DIR}/phonon/VolumeSlider
-${PHONON_INCLUDE_DIR}/phonon/abstractaudiooutput.h
-${PHONON_INCLUDE_DIR}/phonon/abstractmediastream.h
-${PHONON_INCLUDE_DIR}/phonon/abstractvideooutput.h
-${PHONON_INCLUDE_DIR}/phonon/addoninterface.h
-${PHONON_INCLUDE_DIR}/phonon/audiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/audiodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/audiooutput.h
-${PHONON_INCLUDE_DIR}/phonon/audiooutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/backendcapabilities.h
-${PHONON_INCLUDE_DIR}/phonon/backendinterface.h
-${PHONON_INCLUDE_DIR}/phonon/effect.h
-${PHONON_INCLUDE_DIR}/phonon/effectinterface.h
-${PHONON_INCLUDE_DIR}/phonon/effectparameter.h
-${PHONON_INCLUDE_DIR}/phonon/effectwidget.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/
-${PHONON_INCLUDE_DIR}/phonon/experimental/abstractaudiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/abstractvideodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audiodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audiodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/audioformat.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/avcapture.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/avcaptureinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/backendcapabilities.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/backendinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/export.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/globalconfig.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/mediasource.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/objectdescription.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/packet.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/packetpool.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/phononnamespace.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/snapshotinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutput.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutput2.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videodataoutputinterface.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videoframe.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videoframe2.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/videowidget.h
-${PHONON_INCLUDE_DIR}/phonon/experimental/visualization.h
-${PHONON_INCLUDE_DIR}/phonon/globalconfig.h
-${PHONON_INCLUDE_DIR}/phonon/globaldescriptioncontainer.h
-${PHONON_INCLUDE_DIR}/phonon/mediacontroller.h
-${PHONON_INCLUDE_DIR}/phonon/medianode.h
-${PHONON_INCLUDE_DIR}/phonon/mediaobject.h
-${PHONON_INCLUDE_DIR}/phonon/mediaobjectinterface.h
-${PHONON_INCLUDE_DIR}/phonon/mediasource.h
-${PHONON_INCLUDE_DIR}/phonon/mrl.h
-${PHONON_INCLUDE_DIR}/phonon/objectdescription.h
-${PHONON_INCLUDE_DIR}/phonon/objectdescriptionmodel.h
-${PHONON_INCLUDE_DIR}/phonon/path.h
-${PHONON_INCLUDE_DIR}/phonon/phonon_export.h
-${PHONON_INCLUDE_DIR}/phonon/phonondefs.h
-${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h
-${PHONON_INCLUDE_DIR}/phonon/platformplugin.h
-${PHONON_INCLUDE_DIR}/phonon/pulsesupport.h
-${PHONON_INCLUDE_DIR}/phonon/seekslider.h
-${PHONON_INCLUDE_DIR}/phonon/streaminterface.h
-${PHONON_INCLUDE_DIR}/phonon/videoplayer.h
-${PHONON_INCLUDE_DIR}/phonon/videowidget.h
-${PHONON_INCLUDE_DIR}/phonon/videowidgetinterface.h
-${PHONON_INCLUDE_DIR}/phonon/volumefadereffect.h
-${PHONON_INCLUDE_DIR}/phonon/volumefaderinterface.h
-${PHONON_INCLUDE_DIR}/phonon/volumeslider.h
-lib/cmake/phonon_s/
-lib/cmake/phonon_s/PhononConfig.cmake
-lib/cmake/phonon_s/PhononConfigVersion.cmake
-lib/cmake/phonon_s/PhononExperimentalConfig.cmake
-lib/cmake/phonon_s/PhononExperimentalConfigVersion.cmake
-lib/cmake/phonon_s/PhononExperimentalTargets${MODKDE4_CMAKE_PREFIX}.cmake
-lib/cmake/phonon_s/PhononExperimentalTargets.cmake
-lib/cmake/phonon_s/PhononTargets${MODKDE4_CMAKE_PREFIX}.cmake
-lib/cmake/phonon_s/PhononTargets.cmake
-lib/kde4/
-${KDE4LIB}/
-@lib ${KDE4LIB}/libphonon_s.so.${LIBphonon_s_VERSION}
-@lib ${KDE4LIB}/libphonon_sexperimental.so.${LIBphonon_sexperimental_VERSION}
-@lib lib/libphonon_s.so.${LIBphonon_s_VERSION}
-@lib lib/libphonon_sexperimental.so.${LIBphonon_sexperimental_VERSION}
-lib/pkgconfig/phonon_s.pc
-lib/qt4/mkspecs/modules/qt_phonon_s.pri
-share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-share/phonon_s/
-share/phonon_s/buildsystem/
-share/phonon_s/buildsystem/COPYING-CMAKE-SCRIPTS
-share/phonon_s/buildsystem/FindPhononInternal.cmake
-share/phonon_s/buildsystem/MacroEnsureVersion.cmake
-share/phonon_s/buildsystem/MacroLogFeature.cmake
-share/phonon_s/buildsystem/MacroOptionalFindPackage.cmake
-share/phonon_s/buildsystem/PhononMacros.cmake
-share/phonon_s/buildsystem/PhononQt4.cmake
-share/phonon_s/buildsystem/cmake_uninstall.cmake.in
+@comment $OpenBSD: PLIST,v$
+@conflict phonon-<4.11.1
+@conflict phonon-qt5-<=4.10.3p0
+@pkgpath multimedia/phonon-qt5
+@bin bin/phononsettings
+include/phonon4qt5/
+include/phonon4qt5/KDE/
+include/phonon4qt5/KDE/Phonon/
+include/phonon4qt5/KDE/Phonon/AbstractAudioOutput
+include/phonon4qt5/KDE/Phonon/AbstractMediaStream
+include/phonon4qt5/KDE/Phonon/AbstractVideoOutput
+include/phonon4qt5/KDE/Phonon/AddonInterface
+include/phonon4qt5/KDE/Phonon/AudioDevice
+include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator
+include/phonon4qt5/KDE/Phonon/AudioOutput
+include/phonon4qt5/KDE/Phonon/AudioOutputDevice
+include/phonon4qt5/KDE/Phonon/AudioOutputDeviceModel
+include/phonon4qt5/KDE/Phonon/AudioOutputInterface
+include/phonon4qt5/KDE/Phonon/BackendCapabilities
+include/phonon4qt5/KDE/Phonon/BackendInterface
+include/phonon4qt5/KDE/Phonon/Effect
+include/phonon4qt5/KDE/Phonon/EffectDescription
+include/phonon4qt5/KDE/Phonon/EffectDescriptionModel
+include/phonon4qt5/KDE/Phonon/EffectInterface
+include/phonon4qt5/KDE/Phonon/EffectParameter
+include/phonon4qt5/KDE/Phonon/EffectWidget
+include/phonon4qt5/KDE/Phonon/Experimental/
+include/phonon4qt5/KDE/Phonon/Experimental/AbstractVideoDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/AudioDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/SnapshotInterface
+include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutputInterface
+include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame
+include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame2
+include/phonon4qt5/KDE/Phonon/Experimental/Visualization
+include/phonon4qt5/KDE/Phonon/Global
+include/phonon4qt5/KDE/Phonon/MediaController
+include/phonon4qt5/KDE/Phonon/MediaNode
+include/phonon4qt5/KDE/Phonon/MediaObject
+include/phonon4qt5/KDE/Phonon/MediaObjectInterface
+include/phonon4qt5/KDE/Phonon/MediaSource
+include/phonon4qt5/KDE/Phonon/ObjectDescription
+include/phonon4qt5/KDE/Phonon/ObjectDescriptionModel
+include/phonon4qt5/KDE/Phonon/Path
+include/phonon4qt5/KDE/Phonon/PlatformPlugin
+include/phonon4qt5/KDE/Phonon/SeekSlider
+include/phonon4qt5/KDE/Phonon/StreamInterface
+include/phonon4qt5/KDE/Phonon/VideoPlayer
+include/phonon4qt5/KDE/Phonon/VideoWidget
+include/phonon4qt5/KDE/Phonon/VideoWidgetInterface
+include/phonon4qt5/KDE/Phonon/VolumeFaderEffect
+include/phonon4qt5/KDE/Phonon/VolumeFaderInterface
+include/phonon4qt5/KDE/Phonon/VolumeSlider
+include/phonon4qt5/phonon/
+include/phonon4qt5/phonon/AbstractAudioOutput
+include/phonon4qt5/phonon/AbstractMediaStream
+include/phonon4qt5/phonon/AbstractVideoOutput
+include/phonon4qt5/phonon/AddonInterface
+include/phonon4qt5/phonon/AudioCaptureDevice
+include/phonon4qt5/phonon/AudioCaptureDeviceModel
+include/phonon4qt5/phonon/AudioChannelDescription
+include/phonon4qt5/phonon/AudioChannelDescriptionModel
+include/phonon4qt5/phonon/AudioDataOutput
+include/phonon4qt5/phonon/AudioOutput
+include/phonon4qt5/phonon/AudioOutputDevice
+include/phonon4qt5/phonon/AudioOutputDeviceModel
+include/phonon4qt5/phonon/AudioOutputInterface
+include/phonon4qt5/phonon/AudioOutputInterface40
+include/phonon4qt5/phonon/AudioOutputInterface42
+include/phonon4qt5/phonon/AvCapture
+include/phonon4qt5/phonon/BackendCapabilities
+include/phonon4qt5/phonon/BackendInterface
+include/phonon4qt5/phonon/Effect
+include/phonon4qt5/phonon/EffectDescription
+include/phonon4qt5/phonon/EffectDescriptionModel
+include/phonon4qt5/phonon/EffectInterface
+include/phonon4qt5/phonon/EffectParameter
+include/phonon4qt5/phonon/EffectWidget
+include/phonon4qt5/phonon/Global
+include/phonon4qt5/phonon/GlobalDescriptionContainer
+include/phonon4qt5/phonon/MediaController
+include/phonon4qt5/phonon/MediaNode
+include/phonon4qt5/phonon/MediaObject
+include/phonon4qt5/phonon/MediaObjectInterface
+include/phonon4qt5/phonon/MediaSource
+include/phonon4qt5/phonon/Mrl
+include/phonon4qt5/phonon/ObjectDescription
+include/phonon4qt5/phonon/ObjectDescriptionData
+include/phonon4qt5/phonon/ObjectDescriptionModel
+include/phonon4qt5/phonon/ObjectDescriptionModelData
+include/phonon4qt5/phonon/Path
+include/phonon4qt5/phonon/PlatformPlugin
+include/phonon4qt5/phonon/SeekSlider
+include/phonon4qt5/phonon/StreamInterface
+include/phonon4qt5/phonon/SubtitleDescription
+include/phonon4qt5/phonon/SubtitleDescriptionModel
+include/phonon4qt5/phonon/VideoCaptureDevice
+include/phonon4qt5/phonon/VideoCaptureDeviceModel
+include/phonon4qt5/phonon/VideoPlayer
+include/phonon4qt5/phonon/VideoWidget
+include/phonon4qt5/phonon/VideoWidgetInterface
+include/phonon4qt5/phonon/VideoWidgetInterface44
+include/phonon4qt5/phonon/VideoWidgetInterfaceLatest
+include/phonon4qt5/phonon/VolumeFaderEffect
+include/phonon4qt5/phonon/VolumeFaderInterface
+include/phonon4qt5/phonon/VolumeSlider
+include/phonon4qt5/phonon/abstractaudiooutput.h
+include/phonon4qt5/phonon/abstractmediastream.h
+include/phonon4qt5/phonon/abstractvideooutput.h
+include/phonon4qt5/phonon/addoninterface.h
+include/phonon4qt5/phonon/audiodataoutput.h
+include/phonon4qt5/phonon/audiodataoutputinterface.h
+include/phonon4qt5/phonon/audiooutput.h
+include/phonon4qt5/phonon/audiooutputinterface.h
+include/phonon4qt5/phonon/backendcapabilities.h
+include/phonon4qt5/phonon/backendinterface.h
+include/phonon4qt5/phonon/effect.h
+include/phonon4qt5/phonon/effectinterface.h
+include/phonon4qt5/phonon/effectparameter.h
+include/phonon4qt5/phonon/effectwidget.h
+include/phonon4qt5/phonon/experimental/
+include/phonon4qt5/phonon/experimental/abstractaudiodataoutput.h
+include/phonon4qt5/phonon/experimental/abstractvideodataoutput.h
+include/phonon4qt5/phonon/experimental/audiodataoutput.h
+include/phonon4qt5/phonon/experimental/audiodataoutputinterface.h
+include/phonon4qt5/phonon/experimental/audioformat.h
+include/phonon4qt5/phonon/experimental/avcapture.h
+include/phonon4qt5/phonon/experimental/avcaptureinterface.h
+include/phonon4qt5/phonon/experimental/backendcapabilities.h
+include/phonon4qt5/phonon/experimental/backendinterface.h
+include/phonon4qt5/phonon/experimental/export.h
+include/phonon4qt5/phonon/experimental/globalconfig.h
+include/phonon4qt5/phonon/experimental/mediasource.h
+include/phonon4qt5/phonon/experimental/objectdescription.h
+include/phonon4qt5/phonon/experimental/packet.h
+include/phonon4qt5/phonon/experimental/packetpool.h
+include/phonon4qt5/phonon/experimental/phononnamespace.h
+include/phonon4qt5/phonon/experimental/snapshotinterface.h
+include/phonon4qt5/phonon/experimental/videodataoutput.h
+include/phonon4qt5/phonon/experimental/videodataoutput2.h
+include/phonon4qt5/phonon/experimental/videodataoutputinterface.h
+include/phonon4qt5/phonon/experimental/videoframe.h
+include/phonon4qt5/phonon/experimental/videoframe2.h
+include/phonon4qt5/phonon/experimental/videowidget.h
+include/phonon4qt5/phonon/experimental/visualization.h
+include/phonon4qt5/phonon/globalconfig.h
+include/phonon4qt5/phonon/globaldescriptioncontainer.h
+include/phonon4qt5/phonon/mediacontroller.h
+include/phonon4qt5/phonon/medianode.h
+include/phonon4qt5/phonon/mediaobject.h
+include/phonon4qt5/phonon/mediaobjectinterface.h
+include/phonon4qt5/phonon/mediasource.h
+include/phonon4qt5/phonon/mrl.h
+include/phonon4qt5/phonon/objectdescription.h
+include/phonon4qt5/phonon/objectdescriptionmodel.h
+include/phonon4qt5/phonon/path.h
+include/phonon4qt5/phonon/phonon_export.h
+include/phonon4qt5/phonon/phonon_version.h
+include/phonon4qt5/phonon/phonondefs.h
+include/phonon4qt5/phonon/phononnamespace.h
+include/phonon4qt5/phonon/platformplugin.h
+include/phonon4qt5/phonon/pulsesupport.h
+include/phonon4qt5/phonon/seekslider.h
+include/phonon4qt5/phonon/streaminterface.h
+include/phonon4qt5/phonon/videoplayer.h
+include/phonon4qt5/phonon/videowidget.h
+include/phonon4qt5/phonon/videowidgetinterface.h
+include/phonon4qt5/phonon/volumefadereffect.h
+include/phonon4qt5/phonon/volumefaderinterface.h
+include/phonon4qt5/phonon/volumeslider.h
+lib/cmake/phonon4qt5/
+lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
+lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt5/PhononTargets.cmake
+@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
+@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
+lib/pkgconfig/phonon4qt5.pc
+share/kf5/
+share/kf5/mkspecs/
+share/kf5/mkspecs/qt_phonon4qt5.pri
+share/locale/ca/LC_MESSAGES/libphonon_qt.qm
+share/locale/ca/LC_MESSAGES/phononsettings_qt.qm
+share/locale/cs/LC_MESSAGES/libphonon_qt.qm
+share/locale/cs/LC_MESSAGES/phononsettings_qt.qm
+share/locale/de/LC_MESSAGES/libphonon_qt.qm
+share/locale/de/LC_MESSAGES/phononsettings_qt.qm
+share/locale/en_GB/LC_MESSAGES/libphonon_qt.qm
+share/locale/en_GB/LC_MESSAGES/phononsettings_qt.qm
+share/locale/es/LC_MESSAGES/libphonon_qt.qm
+share/locale/es/LC_MESSAGES/phononsettings_qt.qm
+share/locale/eu/LC_MESSAGES/libphonon_qt.qm
+share/locale/eu/LC_MESSAGES/phononsettings_qt.qm
+share/locale/fi/LC_MESSAGES/libphonon_qt.qm
+share/locale/fi/LC_MESSAGES/phononsettings_qt.qm
+share/locale/fr/LC_MESSAGES/libphonon_qt.qm
+share/locale/fr/LC_MESSAGES/phononsettings_qt.qm
+share/locale/gl/LC_MESSAGES/libphonon_qt.qm
+share/locale/id/LC_MESSAGES/libphonon_qt.qm
+share/locale/id/LC_MESSAGES/phononsettings_qt.qm
+share/locale/it/LC_MESSAGES/libphonon_qt.qm
+share/locale/it/LC_MESSAGES/phononsettings_qt.qm
+share/locale/ko/LC_MESSAGES/libphonon_qt.qm
+share/locale/ko/LC_MESSAGES/phononsettings_qt.qm
+share/locale/nl/LC_MESSAGES/libphonon_qt.qm
+share/locale/nl/LC_MESSAGES/phononsettings_qt.qm
+share/locale/nn/LC_MESSAGES/libphonon_qt.qm
+share/locale/nn/LC_MESSAGES/phononsettings_qt.qm
+share/locale/pl/LC_MESSAGES/libphonon_qt.qm
+share/locale/pl/LC_MESSAGES/phononsettings_qt.qm
+share/locale/pt/LC_MESSAGES/libphonon_qt.qm
+share/locale/pt/LC_MESSAGES/phononsettings_qt.qm
+share/locale/pt_BR/LC_MESSAGES/libphonon_qt.qm
+share/locale/pt_BR/LC_MESSAGES/phononsettings_qt.qm
+share/locale/sk/LC_MESSAGES/libphonon_qt.qm
+share/locale/sk/LC_MESSAGES/phononsettings_qt.qm
+share/locale/sr/LC_MESSAGES/libphonon_qt.qm
+share/locale/sr@ijekavian/
+share/locale/sr@ijekavian/LC_MESSAGES/
+share/locale/sr@ijekavian/LC_MESSAGES/libphonon_qt.qm
+share/locale/sr@ijekavianlatin/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/
+share/locale/sr@ijekavianlatin/LC_MESSAGES/libphonon_qt.qm
+share/locale/sr@latin/LC_MESSAGES/libphonon_qt.qm
+share/locale/sv/LC_MESSAGES/libphonon_qt.qm
+share/locale/sv/LC_MESSAGES/phononsettings_qt.qm
+share/locale/uk/LC_MESSAGES/libphonon_qt.qm
+share/locale/uk/LC_MESSAGES/phononsettings_qt.qm
+share/locale/zh_CN/LC_MESSAGES/libphonon_qt.qm
+share/locale/zh_CN/LC_MESSAGES/phononsettings_qt.qm
+share/phonon4qt5/
+share/phonon4qt5/buildsystem/
+share/phonon4qt5/buildsystem/FindPhononInternal.cmake
diff --git a/net/konversation/Makefile b/net/konversation/Makefile
index 2f36e5672ea..4e988d65391 100644
--- a/net/konversation/Makefile
+++ b/net/konversation/Makefile
@@ -4,7 +4,7 @@ COMMENT = IRC client for KDE
V = 1.7.5
DISTNAME = konversation-$V
-REVISION = 0
+REVISION = 1
MAINTAINER = KDE porting team <openbsd-...@googlegroups.com>
@@ -23,12 +23,12 @@ WANTLIB += KF5KIOWidgets KF5Notifications KF5NotifyConfig
KF5Parts
WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets KF5Wallet
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets Qt5Xml
+WANTLIB += c m phonon4qt5 qca-qt5
# GPLv2+
PERMIT_PACKAGE = Yes
MODULES = devel/kf5 \
- multimedia/phonon \
lang/python
BUILD_DEPENDS += devel/kf5/kdoctools \
@@ -59,7 +59,8 @@ LIB_DEPENDS += security/qca-qt5 \
devel/kf5/knotifications \
devel/kf5/kwindowsystem \
devel/kf5/kiconthemes \
- devel/kf5/kitemviews
+ devel/kf5/kitemviews \
+ multimedia/phonon
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index caedad7f98b..411c1794ca0 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -4,6 +4,7 @@ COMMENT = BitTorrent Client
VERSION = 5.2.0
DISTNAME = ktorrent-${VERSION}
+REVISION = 0
SHARED_LIBS += ktcore 1.1 # 0.0
@@ -27,12 +28,11 @@ WANTLIB += KF5TextWidgets KF5Torrent KF5WidgetsAddons
KF5WindowSystem
WANTLIB += KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network
WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5Script
WANTLIB += Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
-WANTLIB += Qt5Widgets Qt5Xml c gcrypt gmp m tag
+WANTLIB += Qt5Widgets Qt5Xml c gcrypt gmp m phonon4qt5 tag
MASTER_SITES = ${MASTER_SITE_KDE:=stable/ktorrent/${VERSION}/}
-MODULES = devel/kf5 \
- multimedia/phonon
+MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
devel/boost
@@ -75,7 +75,8 @@ LIB_DEPENDS = audio/taglib \
x11/qt5/qtlocation \
x11/qt5/qtscript \
x11/qt5/qtwebchannel \
- x11/qt5/qtwebengine
+ x11/qt5/qtwebengine \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/audiocd-kio/Makefile
b/x11/kde-applications/audiocd-kio/Makefile
index 2abf8481e04..015fcfd650d 100644
--- a/x11/kde-applications/audiocd-kio/Makefile
+++ b/x11/kde-applications/audiocd-kio/Makefile
@@ -4,7 +4,7 @@ COMMENT = Kio slave for accessing audio CDs
DISTNAME = audiocd-kio-${VERSION}
PKGNAME = audiocd-kio-kf5-${VERSION}
CATEGORIES = devel audio
-REVISION = 0
+REVISION = 1
SHARED_LIBS += audiocdplugins 1.0 # 5.0
@@ -36,6 +36,7 @@ LIB_DEPENDS = audio/cdparanoia \
devel/kf5/kservice \
devel/kf5/solid \
x11/kde-applications/libkcddb \
- x11/kde-applications/libkcompactdisc
+ x11/kde-applications/libkcompactdisc \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/blinken/Makefile
b/x11/kde-applications/blinken/Makefile
index 56ae45c8f39..46c894c1ddf 100644
--- a/x11/kde-applications/blinken/Makefile
+++ b/x11/kde-applications/blinken/Makefile
@@ -3,7 +3,7 @@
COMMENT = memory enhancement game
DISTNAME = blinken-${VERSION}
CATEGORIES = games education
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://www.kde.org/applications/education/blinken/
@@ -11,10 +11,9 @@ WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs
KF5ConfigCore
WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5Crash
WANTLIB += KF5DBusAddons KF5GuiAddons KF5I18n KF5WidgetsAddons
WANTLIB += KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml c m phonon4qt5experimental
+WANTLIB += Qt5Xml c m phonon4qt5 phonon4qt5experimental
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -32,6 +31,7 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/ki18n \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
- x11/qt5/qtsvg
+ x11/qt5/qtsvg \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/dolphin/Makefile
b/x11/kde-applications/dolphin/Makefile
index feae5059d18..433f682c1bf 100644
--- a/x11/kde-applications/dolphin/Makefile
+++ b/x11/kde-applications/dolphin/Makefile
@@ -4,7 +4,7 @@ COMMENT = KDE File Manager
DISTNAME = dolphin-${VERSION}
PKGNAME = dolphin-kf5-${VERSION}
CATEGORIES = x11
-REVISION = 1
+REVISION = 2
SHARED_LIBS += dolphinprivate 1.0 # 5.0
SHARED_LIBS += dolphinvcs 1.0 # 5.0
@@ -17,7 +17,7 @@ WANTLIB += KF5KCMUtils KF5KIOCore KF5KIOFileWidgets
KF5KIOWidgets
WANTLIB += KF5NewStuff KF5NewStuffCore KF5Notifications KF5Parts
WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets KF5WidgetsAddons
WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c m phonon4qt5
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -25,8 +25,7 @@ MODKDE5_TRANSLATIONS = yes
MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = print/poppler,-qt5 \
devel/kf5/kfilemetadata \
@@ -65,7 +64,8 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/ktextwidgets \
devel/kf5/kwidgetsaddons \
devel/kf5/solid \
- devel/kf5/sonnet
+ devel/kf5/sonnet \
+ multimedia/phonon
CONFIGURE_ARGS += -DBUILD_TESTING=OFF
diff --git a/x11/kde-applications/dragon/Makefile
b/x11/kde-applications/dragon/Makefile
index a84c2ab60c9..5855f94a73a 100644
--- a/x11/kde-applications/dragon/Makefile
+++ b/x11/kde-applications/dragon/Makefile
@@ -3,7 +3,7 @@
COMMENT = simple video player for KDE
DISTNAME = dragon-${VERSION}
CATEGORIES = multimedia
-REVISION = 0
+REVISION = 1
WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
@@ -11,7 +11,7 @@ WANTLIB += KF5Crash KF5DBusAddons KF5I18n KF5JobWidgets
KF5KIOCore
WANTLIB += KF5KIOWidgets KF5Notifications KF5Parts KF5Service
WANTLIB += KF5Solid KF5SonnetUi KF5TextWidgets KF5WidgetsAddons
WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c m phonon4qt5
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -20,7 +20,6 @@ MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
MODULES += x11/kde-applications \
- multimedia/phonon
RUN_DEPENDS = misc/shared-mime-info
@@ -43,7 +42,8 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/ktextwidgets \
devel/kf5/kwidgetsaddons \
devel/kf5/kwindowsystem \
- devel/kf5/kxmlgui
+ devel/kf5/kxmlgui \
+ multimedia/phonon
TEST_IS_INTERACTIVE = X11
diff --git a/x11/kde-applications/gwenview/Makefile
b/x11/kde-applications/gwenview/Makefile
index 43097b0c06b..c578e6e91f4 100644
--- a/x11/kde-applications/gwenview/Makefile
+++ b/x11/kde-applications/gwenview/Makefile
@@ -3,13 +3,10 @@
COMMENT = KDE image viewer
DISTNAME = gwenview-${VERSION}
CATEGORIES = graphics x11
-REVISION = 2
+REVISION = 3
SHARED_LIBS += gwenviewlib 54.0 # 4.97
-MODULES += x11/kde-applications \
- multimedia/phonon
-
WANTLIB += ${COMPILER_LIBCXX} KF5Activities KF5Auth KF5AuthCore
WANTLIB += KF5Baloo KF5Bookmarks KF5Codecs KF5Completion KF5ConfigCore
WANTLIB += KF5ConfigGui KF5ConfigWidgets KF5CoreAddons KF5FileMetaData
@@ -20,7 +17,9 @@ WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets
KF5WidgetsAddons
WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Svg
WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml X11 c cfitsio exiv2
-WANTLIB += jpeg lcms2 m png
+WANTLIB += jpeg lcms2 m phonon4qt5 png z
+
+MODULES += x11/kde-applications
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -64,7 +63,8 @@ LIB_DEPENDS = devel/kf5/baloo,-main \
x11/kde-applications/libkdcraw \
x11/kde-applications/libkipi \
x11/qt5/qtsvg \
- x11/qt5/qtx11extras
+ x11/qt5/qtx11extras \
+ multimedia/phonon
TEST_IS_INTERACTIVE = X11
diff --git a/x11/kde-applications/juk/Makefile
b/x11/kde-applications/juk/Makefile
index da6b3901a2e..3770a5306a3 100644
--- a/x11/kde-applications/juk/Makefile
+++ b/x11/kde-applications/juk/Makefile
@@ -3,7 +3,7 @@
COMMENT = music collection manager and player for KDE
DISTNAME = juk-${VERSION}
CATEGORIES = audio
-REVISION = 2
+REVISION = 3
HOMEPAGE = https://kde.org/applications/multimedia/org.kde.juk
@@ -15,10 +15,9 @@ WANTLIB += KF5KIOCore KF5KIOFileWidgets KF5KIOWidgets
KF5Notifications
WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets KF5Wallet
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml c m tag
+WANTLIB += Qt5Xml c m phonon4qt5 tag
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -56,7 +55,8 @@ LIB_DEPENDS = audio/taglib \
devel/kf5/kxmlgui \
devel/kf5/solid \
devel/kf5/sonnet \
- x11/qt5/qtsvg
+ x11/qt5/qtsvg \
+ multimedia/phonon
TEST_IS_INTERACTIVE = X11
PORTHOME = ${WRKDIR}
diff --git a/x11/kde-applications/kalarm/Makefile
b/x11/kde-applications/kalarm/Makefile
index 65dbdcc4380..8cae89c25e9 100644
--- a/x11/kde-applications/kalarm/Makefile
+++ b/x11/kde-applications/kalarm/Makefile
@@ -3,7 +3,7 @@
COMMENT = personal alarm message, command and email scheduler
DISTNAME = kalarm-${VERSION}
CATEGORIES = productivity
-REVISION = 0
+REVISION = 1
WANTLIB += ${COMPILER_LIBCXX} KF5AkonadiContact KF5AkonadiCore
WANTLIB += KF5AkonadiMime KF5AkonadiWidgets KF5AlarmCalendar KF5Auth
@@ -18,7 +18,7 @@ WANTLIB += KF5Mime KF5Notifications KF5PimCommon
KF5PimTextEdit
WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets KF5Wallet
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets Qt5X11Extras
-WANTLIB += Qt5Xml X11 c m
+WANTLIB += Qt5Xml X11 c m phonon4qt5
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -28,8 +28,7 @@ MODKDE5_DOCS = yes
MODKF5_L10N_CONFLICT = yes
MODKF5_I18N_CONFLICT = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = devel/boost
@@ -64,6 +63,7 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kxmlgui \
devel/kf5/solid \
devel/kf5/sonnet \
+ multimedia/phonon \
x11/kde-applications/akonadi \
x11/kde-applications/akonadi-contacts \
x11/kde-applications/kalarmcal \
diff --git a/x11/kde-applications/kdepim-addons/Makefile
b/x11/kde-applications/kdepim-addons/Makefile
index d38d72f8fc0..15ddf6f7143 100644
--- a/x11/kde-applications/kdepim-addons/Makefile
+++ b/x11/kde-applications/kdepim-addons/Makefile
@@ -42,13 +42,13 @@ WANTLIB += Qt5Quick Qt5WebChannel Qt5WebEngine
Qt5WebEngineCore
WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5Xml c gpgmepp m markdown
WANTLIB += qgpgme
+
MODKDE5_TRANSLATIONS = yes
MODKDE5_DESKTOP_FILE = yes
MODKF5_L10N_CONFLICT = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = textproc/libxslt \
devel/boost \
diff --git a/x11/kde-applications/kio-extras/Makefile
b/x11/kde-applications/kio-extras/Makefile
index 05ffdc7ea49..cefd85b84d0 100644
--- a/x11/kde-applications/kio-extras/Makefile
+++ b/x11/kde-applications/kio-extras/Makefile
@@ -3,7 +3,7 @@
COMMENT = extra functionality for kioslaves
DISTNAME = kio-extras-${VERSION}
CATEGORIES = productivity net
-REVISION = 1
+REVISION = 2
SHARED_LIBS += kioarchive 1.0 # 5.97
SHARED_LIBS += molletnetwork5 1.0 # 18.08
@@ -17,13 +17,13 @@ WANTLIB += KF5ItemViews KF5JobWidgets KF5KIOCore
KF5KIOFileWidgets
WANTLIB += KF5KIOWidgets KF5Pty KF5Service KF5Solid KF5SyntaxHighlighting
WANTLIB += KF5WidgetsAddons KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
WANTLIB += Qt5Gui Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml m
-WANTLIB += mtp phonon4qt5experimental smbclient ssh tag util
+WANTLIB += mtp phonon4qt5 phonon4qt5experimental smbclient ssh
+WANTLIB += tag util
MODKDE5_TRANSLATIONS = yes
MODKDE5_DOCS = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = devel/gperf
@@ -58,7 +58,8 @@ LIB_DEPENDS = audio/taglib \
graphics/openexr \
security/libssh \
net/samba \
- x11/qt5/qtsvg
+ x11/qt5/qtsvg \
+ multimedia/phonon
TEST_IS_INTERACTIVE = X11
PORTHOME = ${WRKDIR}
diff --git a/x11/kde-applications/klettres/Makefile
b/x11/kde-applications/klettres/Makefile
index 4854ec88f11..980c7ca5eae 100644
--- a/x11/kde-applications/klettres/Makefile
+++ b/x11/kde-applications/klettres/Makefile
@@ -3,13 +3,13 @@
COMMENT = alphabet learning application for KDE
DISTNAME = klettres-${VERSION}
CATEGORIES = education
-REVISION = 2
+REVISION = 3
WANTLIB += ${COMPILER_LIBCXX} KF5Attica KF5Auth KF5AuthCore KF5Codecs
WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
WANTLIB += KF5CoreAddons KF5Crash KF5I18n KF5NewStuff KF5NewStuffCore
WANTLIB += KF5Service KF5WidgetsAddons KF5XmlGui Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Network Qt5Svg Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Gui Qt5Network Qt5Svg Qt5Widgets Qt5Xml c m phonon4qt5
MODKDE5_ICON_CACHE = yes
MODKDE5_TRANSLATIONS = yes
@@ -18,8 +18,7 @@ MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
MODKDE5_DESKTOP_FILE = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kauth \
@@ -34,6 +33,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kservice \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
- x11/qt5/qtsvg
+ x11/qt5/qtsvg \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/kmix/Makefile
b/x11/kde-applications/kmix/Makefile
index 0541609d91b..388ee1c366c 100644
--- a/x11/kde-applications/kmix/Makefile
+++ b/x11/kde-applications/kmix/Makefile
@@ -3,7 +3,7 @@
COMMENT = sound channel mixer and volume control
DISTNAME = kmix-${VERSION}
CATEGORIES = audio
-REVISION = 2
+REVISION = 3
HOMEPAGE = https://kde.org/applications/multimedia/org.kde.kmix
@@ -16,8 +16,7 @@ WANTLIB += KF5Plasma KF5Service KF5Solid KF5WidgetsAddons
KF5WindowSystem
WANTLIB += KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Widgets Qt5Xml
WANTLIB += c canberra glib-2.0 m pulse pulse-mainloop-glib
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -43,6 +42,7 @@ LIB_DEPENDS = audio/libcanberra \
devel/kf5/kwidgetsaddons \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
- devel/kf5/plasma-framework
+ devel/kf5/plasma-framework \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/kmousetool/Makefile
b/x11/kde-applications/kmousetool/Makefile
index 2571cfaf5a1..eadb14efce0 100644
--- a/x11/kde-applications/kmousetool/Makefile
+++ b/x11/kde-applications/kmousetool/Makefile
@@ -3,14 +3,14 @@
COMMENT = KDE mouse clicker for accessibility users
DISTNAME = kmousetool-${VERSION}
CATEGORIES = x11 inputmethods
-REVISION = 0
+REVISION = 1
WANTLIB += ${COMPILER_LIBCXX} ICE KF5Auth KF5AuthCore KF5Codecs
WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
WANTLIB += KF5DBusAddons KF5I18n KF5IconThemes KF5Notifications
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Core
WANTLIB += Qt5DBus Qt5Gui Qt5Widgets Qt5Xml SM X11 Xext Xtst c
-WANTLIB += m
+WANTLIB += m phonon4qt5
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -19,9 +19,8 @@ MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
MODULES += x11/kde-applications \
- multimedia/phonon
-LIB_DEPENDS += devel/kf5/kauth \
+LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kcodecs \
devel/kf5/kconfig \
devel/kf5/kconfigwidgets \
@@ -29,7 +28,8 @@ LIB_DEPENDS += devel/kf5/kauth \
devel/kf5/ki18n \
devel/kf5/knotifications \
devel/kf5/kwidgetsaddons \
- devel/kf5/kxmlgui
+ devel/kf5/kxmlgui \
+ multimedia/phonon
CONFIGURE_ARGS =
-DPhonon4Qt5_INCLUDE_DIR="${LOCALBASE}/include/phonon4qt5/"
.include <bsd.port.mk>
diff --git a/x11/kde-applications/korganizer/Makefile
b/x11/kde-applications/korganizer/Makefile
index c60cf056e83..f482183dc55 100644
--- a/x11/kde-applications/korganizer/Makefile
+++ b/x11/kde-applications/korganizer/Makefile
@@ -3,7 +3,7 @@
COMMENT = calendar and scheduling component of kontact
DISTNAME = korganizer-${VERSION}
CATEGORIES = net www
-REVISION = 0
+REVISION = 1
SHARED_LIBS += korganizer_core 0.0 # 5.13.2
SHARED_LIBS += korganizer_interfaces 0.0 # 5.13.2
@@ -24,7 +24,7 @@ WANTLIB += KF5NewStuffCore KF5Notifications KF5Parts
KF5PimCommon
WANTLIB += KF5PimCommonAkonadi KF5PimTextEdit KF5Service KF5SonnetUi
WANTLIB += KF5TextWidgets KF5Wallet KF5WidgetsAddons KF5WindowSystem
WANTLIB += KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network
-WANTLIB += Qt5PrintSupport Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5PrintSupport Qt5Widgets Qt5Xml c m phonon4qt5
MODKDE5_TRANSLATIONS = yes
MODKDE5_ICON_CACHE = yes
@@ -34,8 +34,7 @@ MODKDE5_DOCS = yes
MODKF5_L10N_CONFLICT = yes
MODKF5_I18N_CONFLICT = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = devel/boost
@@ -70,6 +69,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
devel/kf5/sonnet \
+ multimedia/phonon \
x11/kde-applications/akonadi \
x11/kde-applications/akonadi-calendar \
x11/kde-applications/akonadi-contacts \
diff --git a/x11/kde-applications/ksirk/Makefile
b/x11/kde-applications/ksirk/Makefile
index 9e400886007..d64eb27cf59 100644
--- a/x11/kde-applications/ksirk/Makefile
+++ b/x11/kde-applications/ksirk/Makefile
@@ -3,7 +3,7 @@
COMMENT = world domination strategy game
DISTNAME = ksirk-${VERSION}
CATEGORIES = games
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://www.kde.org/applications/games/ksirk
@@ -15,7 +15,7 @@ WANTLIB += KF5CoreAddons KF5Crash KF5I18n KF5IconThemes
KF5KDEGames
WANTLIB += KF5KDEGamesPrivate KF5KIOCore KF5NewStuff KF5NewStuffCore
WANTLIB += KF5Service KF5Wallet KF5WidgetsAddons KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5Quick Qt5QuickWidgets
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m qca-qt5 z
+WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m phonon4qt5 qca-qt5 z
MODKDE5_ICON_CACHE = yes
MODKDE5_TRANSLATIONS = yes
@@ -23,8 +23,7 @@ MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
MODKDE5_DESKTOP_FILE = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = x11/qt5/qtquickcontrols
RUN_DEPENDS = x11/qt5/qtquickcontrols
@@ -46,6 +45,7 @@ LIB_DEPENDS = devel/kf5/kauth \
security/qca-qt5 \
x11/kde-applications/libkdegames \
x11/qt5/qtdeclarative \
- x11/qt5/qtsvg
+ x11/qt5/qtsvg \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/kwordquiz/Makefile
b/x11/kde-applications/kwordquiz/Makefile
index 4fa17627f98..7ec3c7feb60 100644
--- a/x11/kde-applications/kwordquiz/Makefile
+++ b/x11/kde-applications/kwordquiz/Makefile
@@ -3,7 +3,7 @@
COMMENT = general purpose flash card program for KDE
DISTNAME = kwordquiz-${VERSION}
CATEGORIES = games
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://www.kde.org/applications/games/kwordquiz
@@ -13,7 +13,7 @@ WANTLIB += KF5CoreAddons KF5Crash KF5GuiAddons KF5I18n
KF5IconThemes
WANTLIB += KF5ItemViews KF5NewStuff KF5NewStuffCore KF5Notifications
WANTLIB += KF5NotifyConfig KF5Service KF5WidgetsAddons KF5WindowSystem
WANTLIB += KF5XmlGui Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Widgets Qt5Xml c m phonon4qt5
MODKDE5_ICON_CACHE = yes
MODKDE5_TRANSLATIONS = yes
@@ -22,8 +22,7 @@ MODKF5_L10N_CONFLICT = yes
MODKDE5_DESKTOP_FILE = yes
MODKDE5_DOCS = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kauth \
@@ -44,6 +43,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kwidgetsaddons \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
- x11/kde-applications/libkeduvocdocument
+ x11/kde-applications/libkeduvocdocument \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/libkcompactdisc/Makefile
b/x11/kde-applications/libkcompactdisc/Makefile
index 6dd06b2845a..b56edf72211 100644
--- a/x11/kde-applications/libkcompactdisc/Makefile
+++ b/x11/kde-applications/libkcompactdisc/Makefile
@@ -4,21 +4,21 @@ COMMENT = library for interfacing with CDs
DISTNAME = libkcompactdisc-${VERSION}
PKGNAME = libkcompactdisc-kf5-${VERSION}
CATEGORIES = devel multimedia
-REVISION = 0
+REVISION = 1
SHARED_LIBS += KF5CompactDisc 1.0 # 5.0
WANTLIB += ${COMPILER_LIBCXX} KF5CoreAddons KF5I18n KF5Solid Qt5Core
-WANTLIB += Qt5DBus m
+WANTLIB += Qt5DBus Qt5Gui Qt5Widgets m phonon4qt5
MODKDE5_TRANSLATIONS = yes
MODKF5_L10N_CONFLICT = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
LIB_DEPENDS = devel/kf5/kcoreaddons \
devel/kf5/ki18n \
- devel/kf5/solid
+ devel/kf5/solid \
+ multimedia/phonon
.include <bsd.port.mk>
diff --git a/x11/kde-applications/mailcommon/Makefile
b/x11/kde-applications/mailcommon/Makefile
index 9442af89888..53b960b65fa 100644
--- a/x11/kde-applications/mailcommon/Makefile
+++ b/x11/kde-applications/mailcommon/Makefile
@@ -20,13 +20,12 @@ WANTLIB += KF5PimCommonAkonadi KF5PimTextEdit KF5Service
KF5SonnetUi
WANTLIB += KF5SyntaxHighlighting KF5TemplateParser KF5TextWidgets
WANTLIB += KF5Wallet KF5WidgetsAddons KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets Qt5Xml
-WANTLIB += gpgmepp m qgpgme
+WANTLIB += gpgmepp m phonon4qt5 qgpgme
MODKDE5_TRANSLATIONS = yes
MODKF5_L10N_CONFLICT = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = textproc/libxslt \
devel/boost \
@@ -59,7 +58,8 @@ LIB_DEPENDS = devel/kf5/karchive \
x11/kde-applications/libkdepim \
x11/kde-applications/mailimporter \
x11/kde-applications/messagelib \
- x11/kde-applications/pimcommon
+ x11/kde-applications/pimcommon \
+ multimedia/phonon
TEST_IS_INTERACTIVE = X11
diff --git a/x11/kde-applications/marble/Makefile
b/x11/kde-applications/marble/Makefile
index ae4587167fd..9e3711715b9 100644
--- a/x11/kde-applications/marble/Makefile
+++ b/x11/kde-applications/marble/Makefile
@@ -4,7 +4,7 @@ COMMENT = virtual globe and world atlas
DISTNAME = marble-${VERSION}
PKGNAME = marble-kf5-${VERSION}
CATEGORIES = geo
-REVISION = 2
+REVISION = 3
HOMEPAGE = https://marble.kde.org/
@@ -21,7 +21,7 @@ WANTLIB += KF5TextWidgets KF5WidgetsAddons KF5XmlGui
Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport
WANTLIB += Qt5Qml Qt5Quick Qt5SerialPort Qt5Sql Qt5Svg Qt5WebChannel
WANTLIB += Qt5WebEngine Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets
-WANTLIB += Qt5Xml c gps m shp z
+WANTLIB += Qt5Xml c gps m phonon4qt5 shp z
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -30,8 +30,7 @@ MODKF5_I18N_CONFLICT = yes
MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = x11/qt5/qtquickcontrols \
devel/protobuf \
@@ -62,6 +61,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/sonnet \
devel/shapelib \
misc/gpsd,-main \
+ multimedia/phonon \
x11/qt5/qtdeclarative \
x11/qt5/qtlocation \
x11/qt5/qtserialport \
@@ -71,8 +71,7 @@ LIB_DEPENDS = devel/kf5/attica \
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_libwlocate=ON \
-DBUILD_MARBLE_TOOLS=ON \
-DBUILD_MARBLE_EXAMPLES=OFF \
- -DMOBILE=OFF \
-
-DPhonon4Qt5_INCLUDE_DIR="${LOCALBASE}/include/phonon4qt5/"
+ -DMOBILE=OFF
TEST_IS_INTERACTIVE = X11
diff --git a/x11/kde-applications/okular/Makefile
b/x11/kde-applications/okular/Makefile
index 23306597143..a00ed4c7dca 100644
--- a/x11/kde-applications/okular/Makefile
+++ b/x11/kde-applications/okular/Makefile
@@ -3,7 +3,7 @@
COMMENT = KDE document viewer
DISTNAME = okular-${VERSION}
CATEGORIES = textproc
-REVISION = 4
+REVISION = 5
HOMEPAGE = https://okular.kde.org/
@@ -19,8 +19,8 @@ WANTLIB += KF5Solid KF5SonnetUi KF5TextWidgets KF5ThreadWeaver
WANTLIB += KF5Wallet KF5WidgetsAddons KF5WindowSystem KF5XmlGui
WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
WANTLIB += Qt5Svg Qt5TextToSpeech Qt5Widgets Qt5Xml c chm djvulibre
-WANTLIB += epub freetype jpeg m markdown poppler poppler-qt5 qca-qt5
-WANTLIB += qmobipocket tiff z zip
+WANTLIB += epub freetype jpeg m markdown phonon4qt5 poppler poppler-qt5
+WANTLIB += qca-qt5 qmobipocket tiff z zip
MODKDE5_DESKTOP_FILE = yes
MODKDE5_ICON_CACHE = yes
@@ -29,8 +29,7 @@ MODKF5_I18N_CONFLICT = yes
MODKF5_L10N_CONFLICT = yes
MODKDE5_DOCS = yes
-MODULES += x11/kde-applications \
- multimedia/phonon
+MODULES += x11/kde-applications
BUILD_DEPENDS = net/libvncserver \
print/libspectre
@@ -70,6 +69,7 @@ LIB_DEPENDS = devel/chmlib \
devel/kf5/threadweaver \
graphics/djvulibre \
graphics/tiff \
+ multimedia/phonon \
print/poppler,-qt5 \
security/qca-qt5 \
textproc/discount \
