4 files changed, 167 insertions, 15 deletions
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 969857620107..43eb422c1bf2 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,4 +1,6 @@
 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
-EBUILD mumble-1.5.634.ebuild 3843 BLAKE2B 27905d5417cfcf204dfd0afc060680dd1a5226904c416040b1d477fa85e69115417a4d30166606a32362e33ab96de163703585fce70680931d413ce22ae3640f SHA512 0336f37ce6dfa9eeeadf0a6f70217da5ac6116fff0bde9cf170aa73ad516a982240b22bd5617f680a75d1be9d2351ee90bcb2e74301724ceb52a03a27628e212
-EBUILD mumble-9999.ebuild 3847 BLAKE2B 48bef31f25ec85759d59c3c3b8d6cffa28174da89f122a819cd33cc4488f8ae1ea0eb7a4d56fde441f3bf193d832e9c8f6f3d7a0f4d19ef8aa4caa14735ecabe SHA512 45c6bc0bdb1bd4a2a39af4d11997b53d78aa10eef7d195ba202b486cfa074312029bd202c755f7ab0f969f3e4d500bcd274d05f8722beb66eb281ce250b9dff2
+DIST mumble-1.5.735.tar.gz 26010842 BLAKE2B 3eeb3e51f691f2179848341ba9e7d31a31cd1a66bd9c1edabeec90c99885a9630c74374d8c357d5fbfb9ee205d63aceeabcafd718350cc34c57c4fe1e7a5bf94 SHA512 1dba58e6f39dbef88c6e0d1501530bee62af5bd6c798dcfdbe6c9d94c1ec22ab91d157ba3ccb96d810daf31907ac2bbec876be20b8c9613664488e6bb03a5b5b
+EBUILD mumble-1.5.634-r1.ebuild 3845 BLAKE2B 2df5785e649afb16b3b482c11b64d46667f9d5bfd5c01c4607ad499d2dd254fb79a0a0227229dc0c0cd7961245e21f68bd0eb2dc8beeb51eb87a6163b77fda1e SHA512 548e21de593aa88f0d10cd518efbe155fe2ab17289f053e1dc32ee4331f4e96035dd217603aad32151bcb13c9da1868ace0b7b0762d2dae585e3b544061873f0
+EBUILD mumble-1.5.735.ebuild 3849 BLAKE2B 2546a7f93a30f910d76c2db575461d004cb250840a58287bc5dd791da1b66734bd40e7b7ee782c8b2533e6ba3499a8325157d4538528dd331e2f1cb7491fc45b SHA512 ff6e125c7164b4dac9c3916a0c50775cebec06ac1eec62b682b553acf29f9c9ec41de11550e6d5588c50ea1340d456caccf24c0f1a7f96c5d36e3616d4f71790
+EBUILD mumble-9999.ebuild 3778 BLAKE2B 3a33006f40fb33bb4076266fba80a7f6f5b1f1318b24395ccc298f7df34d522d1bee91141bbdee986b35db43726b524437753b3709a35d6d29215c1e90b9e8d3 SHA512 4cbb0af7987020902f9f5752f7f2486d262339411c4787c1e56a3126dfbbb92cc3503d75c3fe38736e5e6b9fd6376c2ffe56437989dcf3c2c512699f7c14f910
 MISC metadata.xml 659 BLAKE2B 29aa7577035302a7cdcd6c433bcdfa6754b13b6b4c41add1779c176e9ab58a2b7a5b74a71269c0ab5e2a2cf6442218e1a9529c26175286431c121ea398e02276 SHA512 82d88c9d5d4fcbe79cbed7de582ad13dcdcbd81165cb808373b2917d59d56bd7b724ed5c1710c17552e8efde39d0f7cc058d3b30355379ea5f1ee3a4d1995227
diff --git a/net-voip/mumble/mumble-1.5.634.ebuild b/net-voip/mumble/mumble-1.5.634-r1.ebuild
index 51d7304ddd07..17c197c6fcec 100644
--- a/net-voip/mumble/mumble-1.5.634.ebuild
+++ b/net-voip/mumble/mumble-1.5.634-r1.ebuild
@@ -44,7 +44,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-cpp/ms-gsl
 	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco[util,xml,zip]
+	dev-libs/poco:=[util,xml,zip]
 	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
diff --git a/net-voip/mumble/mumble-1.5.735.ebuild b/net-voip/mumble/mumble-1.5.735.ebuild
new file mode 100644
index 000000000000..4160042b4c49
--- /dev/null
+++ b/net-voip/mumble/mumble-1.5.735.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic multilib python-any-r1 xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+
+	# needed for the included 3rdparty license script,
+	# even if these components may not be compiled in
+	EGIT_SUBMODULES=(
+		'-*'
+		3rdparty/cmake-compiler-flags
+		3rdparty/FindPythonInterpreter
+		3rdparty/flag-icons
+		3rdparty/minhook
+		3rdparty/renamenoise
+		3rdparty/speexdsp
+		3rdparty/tracy
+	)
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/ms-gsl
+	>=dev-libs/openssl-1.0.0b:0=
+	dev-libs/poco:=[util,xml,zip]
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.3.1
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	g15? ( app-misc/g15daemon:= )
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	pipewire? ( media-video/pipewire )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-cpp/nlohmann_json
+	dev-qt/qtconcurrent:5
+	dev-qt/qttest:5
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
+
+	# required because of xdg.eclass also providing src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-Dalsa="$(usex alsa)"
+		-Dbundled-gsl="OFF"
+		-Dbundled-json="OFF"
+		-Dbundled-speex="OFF"
+		-Dg15="$(usex g15)"
+		-Djackaudio="$(usex jack)"
+		-Doverlay="ON"
+		-Dportaudio="$(usex portaudio)"
+		-Doverlay-xcompile="$(usex multilib)"
+		-Dpipewire="$(usex pipewire)"
+		-Dpulseaudio="$(usex pulseaudio)"
+		-Drenamenoise="$(usex rnnoise)"
+		-Dserver="OFF"
+		-Dspeechd="$(usex speech)"
+		-Dtests="$(usex test)"
+		-Dtracy="OFF"
+		-Dtranslations="$(usex nls)"
+		-Dupdate="OFF"
+		-Dwarnings-as-errors="OFF"
+		-Dzeroconf="$(usex zeroconf)"
+	)
+
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
+
+	# https://bugs.gentoo.org/832978
+	# fix tests (and possibly runtime issues) on arches with unsigned chars
+	append-cxxflags -fsigned-char
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use amd64 && use multilib ; then
+		# The 32bit overlay library gets built when multilib is enabled.
+		# Install it into the correct 32bit lib dir.
+		local libdir_64="/usr/$(get_libdir)/mumble"
+		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"
+		dodir ${libdir_32}
+		mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
+			"${ED}"/${libdir_32}/ || die
+	fi
+
+	insinto /usr/share/mumble
+	doins -r samples
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
+	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index d368df565216..38094ae801eb 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -23,6 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then
 		3rdparty/renamenoise
 		3rdparty/speexdsp
 		3rdparty/tracy
+		3rdparty/utfcpp
 	)
 else
 	if [[ "${PV}" == *_pre* ]] ; then
@@ -44,16 +45,10 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-cpp/ms-gsl
 	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco[util,xml,zip]
+	dev-libs/poco:=[util,xml,zip]
 	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	dev-qt/qtbase:6[dbus,gui,network,sqlite,widgets,xml]
+	dev-qt/qtsvg:6
 	>=media-libs/libsndfile-1.0.20[-minimal]
 	>=media-libs/opus-1.3.1
 	>=media-libs/speex-1.2.0
@@ -73,13 +68,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-cpp/nlohmann_json
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
+	dev-qt/qtbase:6[concurrent]
 	dev-libs/boost
 	x11-base/xorg-proto
 "
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 "