[gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/, media-sound/mumble/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/, media-sound/mumble/files/

[Lars Wendler]

commit:     b2c228b497bb98d4a7095de27a743e648c964b08
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 14:06:48 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 14:30:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c228b4

media-sound/mumble: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/mumble/Manifest                       |   2 -
 media-sound/mumble/files/mumble-1.2.8-gcc49.patch |  26 -----
 media-sound/mumble/mumble-1.2.10-r1.ebuild        | 128 ----------------------
 media-sound/mumble/mumble-1.2.11.ebuild           | 128 ----------------------
 4 files changed, 284 deletions(-)

diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 5fb464a..6aeffce 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,5 +1,3 @@
-DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
-DIST mumble-1.2.11.tar.gz 3196837 SHA256 e8ec96ec367151064352195d3f84aa9fe4e456e70c57037e0d0cb84155d603e6 SHA512 72500362dc137909465f8b932648cee6e9dd4d2c57e6f85a73de21cfe1e99ca8e290f899d50ae237729b24e86406ffedca8024977e94a30ffc863525c82c2995 WHIRLPOOL 7a32e57f8744c2e1b7dd8088334f062266af30f7cc2f64191f9e74e340b01e4b0253b6f23b8edf80dc20082ffd6d44f30e447a11a40d7c4710c208c649da4f3a
 DIST mumble-1.2.12.tar.gz 3197498 SHA256 5981ec2e8e62a0b47f1bfa9240721a885c9edb89e14cdf5db149e0ee723d5727 SHA512 fb800fc7b7eab57faefdd8fec1f6f28d7485a872faef8f7a8bfa27ff42d06813be8aca59d28bef2f857e467a5a7ba70e36b02b8391752ce15ee93f3d118501e0 WHIRLPOOL 46d1177e955e0e359422b94c656403e9788aa9188c8dc7e923fc9e0f5a6cbe9e7b393953c95fee67cdff7dd00a1fd6d4a9f803491c9deb8d3c370d6dfd7eeafa
 DIST mumble-1.2.13.tar.gz 3197575 SHA256 b7db708fc3760cb6a5f81142a8bac0866f0d82d3aa401773a38c75c416020146 SHA512 0315a7027add1c11f340930d52256dd02fbd5433a38e9043e5cc98342c18ceee04f7635948f01717faf85255271eb5bcf8dfb9dfba67f51c9da39e4779d33f79 WHIRLPOOL 75ae2a7c67e30026908995dda0554a818668ae99449ebd9f1e2bdea48f421e5b0f51b1251338118f2627df0b4e27d88302f2dbb602b9ce1b6f211c6bc911541e
 DIST mumble-1.2.6.tar.gz 3201577 SHA256 876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff SHA512 cf67d171bb76d30fd0b098552ac1707423cdeb7d04031fd5f6693cad4661f3a2d99b8e8d653686fab00f46e66257f8fb75c819b9ad1d4f514a0d0b04c36a446e WHIRLPOOL 37654990d66fb01fc7265c5757ad8b79e9a10325b669735f3010486b15896e3d191bb705664a1151c4b0eea1cb6c17daef86e45c38247a1463ad72c273019ee7

diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
deleted file mode 100644
index cecb3d3..0000000
--- a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/532180
-
-Avoid "jump to label crosses initialization" error.
-
- Move variable "buffer" into the while loop to avoid a compile error
- with g++ 4.9.0.
-
- Although earlier compiler versions did accept the code, jumping into the
- scope of an variable length array is not allowed:
- http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
-
-
---- a/src/mumble/OSS.cpp
-+++ b/src/mumble/OSS.cpp
-@@ -243,9 +243,9 @@ void OSSInput::run() {
- 	eMicFormat = SampleShort;
- 	initializeMixer();
- 
--	short buffer[iMicLength];
--
- 	while (bRunning) {
-+		short buffer[iMicLength];
-+
- 		int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short));
- 		ssize_t l = read(fd, buffer, len);
- 		if (l != len) {

diff --git a/media-sound/mumble/mumble-1.2.10-r1.ebuild b/media-sound/mumble/mumble-1.2.10-r1.ebuild
deleted file mode 100644
index 267536c..0000000
--- a/media-sound/mumble/mumble-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-QT_MINIMAL="4.6"
-
-inherit eutils multilib qt4-r2
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/protobuf-2.2.0
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.0.1
-	>=media-libs/speex-1.2_rc1
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local conf_add
-
-	if has_version '<=sys-devel/gcc-4.2'; then
-		conf_add="${conf_add} no-pch"
-	else
-		use pch || conf_add="${conf_add} no-pch"
-	fi
-
-	use alsa || conf_add="${conf_add} no-alsa"
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use g15 || conf_add="${conf_add} no-g15"
-	use oss || conf_add="${conf_add} no-oss"
-	use portaudio || conf_add="${conf_add} no-portaudio"
-	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
-	use speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_compile() {
-	# parallel make workaround, bug #445960
-	emake -j1
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-
-	insopts -o root -g root -m 0755
-	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/libmumble.so.${PV}
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}

diff --git a/media-sound/mumble/mumble-1.2.11.ebuild b/media-sound/mumble/mumble-1.2.11.ebuild
deleted file mode 100644
index 267536c..0000000
--- a/media-sound/mumble/mumble-1.2.11.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-QT_MINIMAL="4.6"
-
-inherit eutils multilib qt4-r2
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/protobuf-2.2.0
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/opus-1.0.1
-	>=media-libs/speex-1.2_rc1
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local conf_add
-
-	if has_version '<=sys-devel/gcc-4.2'; then
-		conf_add="${conf_add} no-pch"
-	else
-		use pch || conf_add="${conf_add} no-pch"
-	fi
-
-	use alsa || conf_add="${conf_add} no-alsa"
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use g15 || conf_add="${conf_add} no-g15"
-	use oss || conf_add="${conf_add} no-oss"
-	use portaudio || conf_add="${conf_add} no-portaudio"
-	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
-	use speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_compile() {
-	# parallel make workaround, bug #445960
-	emake -j1
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-
-	insopts -o root -g root -m 0755
-	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/libmumble.so.${PV}
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/, media-sound/mumble/files/

[Andreas Sturmlechner]

commit:     5923dcabd01b0fbf953faa4173d593f84ebf91b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 21:03:53 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 21:51:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5923dcab

media-sound/mumble: Fix build with Qt 5.15

Thanks-to: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/726692
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mumble/files/mumble-1.3.1_rc1-qt-5.15.patch    | 28 ++++++++++++++++++++++
 media-sound/mumble/mumble-1.3.1_rc1.ebuild         |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
new file mode 100644
index 00000000000..4268d56e829
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
+From: Marco Genasci <fedeliallalinea@gmail.com>
+Date: Mon, 1 Jun 2020 21:01:00 +0200
+Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
+ include for Qt 5.15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
+   42 |   QPainterPath qpp;
+      |                ^~~
+---
+ src/mumble/OverlayText.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
+index f06f2b63a8..c1cd9efdd7 100644
+--- a/src/mumble/OverlayText.h
++++ b/src/mumble/OverlayText.h
+@@ -6,6 +6,7 @@
+ #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ 
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QFont>
+ 

diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
index 69f5d7055e0..f23f44786ac 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
@@ -64,6 +64,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
+
 # NB: qmake does not support multilib but it's fine to configure
 # for the native ABI here
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/, media-sound/mumble/files/

[Lars Wendler]

commit:     afb1ec34cf10f931617592db03d8d096e4b703e2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:11:34 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 09:12:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb1ec34

media-sound/mumble: Apply forthcoming upstream solution for system_json

Bug: https://bugs.gentoo.org/834030
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../mumble/files/mumble-9999-system_json.patch     | 58 +++++++++++++++++++---
 media-sound/mumble/mumble-9999.ebuild              |  1 +
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/media-sound/mumble/files/mumble-9999-system_json.patch b/media-sound/mumble/files/mumble-9999-system_json.patch
index 2be7553d50ef..bb04dc0a01e0 100644
--- a/media-sound/mumble/files/mumble-9999-system_json.patch
+++ b/media-sound/mumble/files/mumble-9999-system_json.patch
@@ -1,18 +1,60 @@
+From a239ccf62369880a0b08faf01021e7961ec1cc5a Mon Sep 17 00:00:00 2001
+From: Robert Adam <dev@robert-adam.de>
+Date: Fri, 25 Feb 2022 18:37:51 +0100
+Subject: [PATCH] BUILD(client): Add option to use system JSON lib
+
+This commit introduces an option that toggles between using a bundled
+version of nlohmann_json (default) and looking for a version installed
+on the system instead.
+
+Fixes #5584
+---
+ docs/dev/build-instructions/cmake_options.md |  5 +++++
+ src/mumble/CMakeLists.txt                    | 11 ++++++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md
+index 2a02b200b7..b395251069 100644
+--- a/docs/dev/build-instructions/cmake_options.md
++++ b/docs/dev/build-instructions/cmake_options.md
+@@ -34,6 +34,11 @@ Bundle Qt's translations as well
+ Build the included version of CELT instead of looking for one on the system.
+ (Default: ON)
+ 
++### bundled-json
++
++Build the included version of nlohmann_json instead of looking for one on the system
++(Default: ON)
++
+ ### bundled-opus
+ 
+ Build the included version of Opus instead of looking for one on the system.
 diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
-index bb8df1671..51f83850e 100644
+index bb8df16714..5f1c14ba97 100644
 --- a/src/mumble/CMakeLists.txt
 +++ b/src/mumble/CMakeLists.txt
-@@ -472,12 +472,7 @@ else()
+@@ -27,6 +27,7 @@ option(bundled-celt "Build the included version of CELT instead of looking for o
+ option(bundled-speex "Build the included version of Speex instead of looking for one on the system." ON)
+ option(rnnoise "Use RNNoise for machine learning noise reduction." ON)
+ option(bundled-rnnoise "Build the included version of RNNoise instead of looking for one on the system." ${rnnoise})
++option(bundled-json "Build the included version of nlohmann_json instead of looking for one on the system" ON)
+ 
+ option(manual-plugin "Include the built-in \"manual\" positional audio plugin." ON)
+ 
+@@ -472,9 +473,13 @@ else()
  endif()
  
  
 -set(JSON_BuildTests OFF CACHE INTERNAL "")
 -set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
 -add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
--
--target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json)
--
-+find_pkg("nlohmann_json" REQUIRED)
- find_pkg("SndFile;LibSndFile;sndfile" REQUIRED)
++if(bundled-json)
++	set(JSON_BuildTests OFF CACHE INTERNAL "")
++	set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
++	add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
++else()
++	find_pkg("nlohmann_json" REQUIRED)
++endif()
+ 
+ target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json)
  
- # Check if sndfile version supports opus

diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index a5cfa6d410b7..abee2e9d032d 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -84,6 +84,7 @@ src_configure() {
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
 		-Dbundled-celt="ON"
+		-Dbundled-json="OFF"
 		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
 		-Ddbus="$(usex dbus)"