git: 7dc8045a6393 - main - KDE: change default sound mixer applet

[Tobias C. Berner]

The branch main has been updated by tcberner:

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

commit 7dc8045a63930a3a520e17723139003867b58c39
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-09-20 05:58:31 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-09-20 06:06:30 +0000

    KDE: change default sound mixer applet
    
    The kmix mixer is being replaced by the more flexible and integrated
    plasma-pa mixer from audio/plasma5-plasma-pa
    
    For this:
    
            - remove audio/kmix from the default options set in the metaport
              multimedia/kdemultimedia
    
            - add audio/plasma5-plasma-pa to the default options set in the
              metaport x11/plasma5-plasma
    
    If you do not want pulseaudio on your system and want to keep using
    the old mixer, you have multiple options:
    
            a) don't install the metaports (they only pull in other
               packages)
            b) manually build multimedia/kdemultimedia and
               x11/plasma5-plasma with your chosen options
            c) install both
    
    Reported by:            Graham Perrin <grahamperrin at gmail.com>
    PR:                     258579
---
 multimedia/kdemultimedia/Makefile | 4 +++-
 x11/plasma5-plasma/Makefile       | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/multimedia/kdemultimedia/Makefile b/multimedia/kdemultimedia/Makefile
index 8706989552ce..8461187dd3e4 100644
--- a/multimedia/kdemultimedia/Makefile
+++ b/multimedia/kdemultimedia/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kdemultimedia
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 
 MAINTAINER=	kde at FreeBSD.org
@@ -9,7 +10,7 @@ USES=		kde:5 metaport qt:5
 USE_QT=		#
 
 OPTIONS_DEFINE=		DRAGON FFMPEG AUDIOCD_KIO KDENLIVE KMIX
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NKMIX}
 
 DRAGON_DESC=		Simple video player
 DRAGON_RUN_DEPENDS=	dragon-player>=${KDE_APPLICATIONS_VERSION}:multimedia/dragon
@@ -20,6 +21,7 @@ FFMPEG_RUN_DEPENDS=	kdemultimedia-ffmpegthumbs>=${KDE_APPLICATIONS_VERSION}:mult
 AUDIOCD_KIO_DESC=	Audio CD IOSlave
 AUDIOCD_KIO_RUN_DEPENDS=	audiocd-kio>=${KDE_APPLICATIONS_VERSION}:audio/audiocd-kio
 
+# KMix is being replaced by the plasma-pa mixer
 KMIX_DESC=		Audio mixer
 KMIX_RUN_DEPENDS=	kmix>=${KDE_APPLICATIONS_VERSION}:audio/kmix
 
diff --git a/x11/plasma5-plasma/Makefile b/x11/plasma5-plasma/Makefile
index 38c8bbf2384d..1c9494307b74 100644
--- a/x11/plasma5-plasma/Makefile
+++ b/x11/plasma5-plasma/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	plasma
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 PKGNAMEPREFIX=	plasma5-
 
@@ -15,7 +16,7 @@ USES=		kde:5 metaport qt:5
 USE_KDE=	${_USE_PLASMA_ALL:Nplasma-pa}
 
 OPTIONS_DEFINE=	PHONON PULSEAUDIO
-OPTIONS_DEFAULT=	PHONON
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 # Different from PHONON, because this is about the output plugins
 PHONON_DESC=	Include phonon-gstreamer, for sound output