From owner-dev-commits-ports-all@freebsd.org Mon Sep 20 06:07:47 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4513679099; Mon, 20 Sep 2021 06:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HCYxv68kBz4XRr; Mon, 20 Sep 2021 06:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B380C3517; Mon, 20 Sep 2021 06:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18K67lfI075203; Mon, 20 Sep 2021 06:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18K67lum075202; Mon, 20 Sep 2021 06:07:47 GMT (envelope-from git) Date: Mon, 20 Sep 2021 06:07:47 GMT Message-Id: <202109200607.18K67lum075202@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 7dc8045a6393 - main - KDE: change default sound mixer applet MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dc8045a63930a3a520e17723139003867b58c39 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 06:07:48 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dc8045a63930a3a520e17723139003867b58c39 commit 7dc8045a63930a3a520e17723139003867b58c39 Author: Tobias C. Berner AuthorDate: 2021-09-20 05:58:31 +0000 Commit: Tobias C. Berner 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 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@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