gentoo auto-resync : 09:06:2024 - 00:08:13

3 files changed, 170 insertions, 13 deletions

diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 1e4c32407d41..8761fd1441e2 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -3,6 +3,8 @@ DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe27
 DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
 DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
 DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
+DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
 EBUILD mumble-1.4.287-r1.ebuild 4138 BLAKE2B 3761785af0e3becaff28fd4c1d31bcc0bede8ae136fbd397db1527af6beeace2325ebfe2569d150be164fcfa6bdedac13f8ae9910ad9c4d433f41a7b05505628 SHA512 7c93d2540a6aaeb46da43ced787e2ce87319f9aacc3567538af880bd6cee8001d5f4f72cbe77a5c517c3e6fad925f0bdb8b39236d8155f0ddb3c450c7c387444
-EBUILD mumble-9999.ebuild 3871 BLAKE2B 78c85aebd45cf8a7d2260af7042bdf38c9bb6729d52b29ca5d58b587caaad4df9e604bc3360b2e0f3a0d1ab4ae1aef4fc158bedb45f914b143fb8fd03054ec54 SHA512 ebcc666175f3b17aa7753734dbdbbd3ea6e51ee502015f56fcbae667d52c8a3d06379f33bde09ca5ee2ea23190ca05a402abb55b135bc5e932d0147303cdd43c
+EBUILD mumble-1.5.634.ebuild 3847 BLAKE2B e9a1d2844b79701234871375da0d2fbef356085b17978af817f3388bc8f9e96049089dcd13e1634b54e3422ba3c6a972b956035dc67386ec711e812641d47840 SHA512 f03de8c2b2b82ad5991a58fa489d32c85b09aadcb9349035c2b81caec6b4e8c0204bc5871d0d23bd99a27f4040ea7d4db5c7cdcc556d8c3cad7920734dd30632
+EBUILD mumble-9999.ebuild 3847 BLAKE2B e9a1d2844b79701234871375da0d2fbef356085b17978af817f3388bc8f9e96049089dcd13e1634b54e3422ba3c6a972b956035dc67386ec711e812641d47840 SHA512 f03de8c2b2b82ad5991a58fa489d32c85b09aadcb9349035c2b81caec6b4e8c0204bc5871d0d23bd99a27f4040ea7d4db5c7cdcc556d8c3cad7920734dd30632
 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.ebuild
new file mode 100644
index 000000000000..4ba02c3ee8b2
--- /dev/null
+++ b/net-voip/mumble/mumble-1.5.634.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..12} )
+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 79e98b80ec73..4ba02c3ee8b2 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic python-any-r1 xdg
+PYTHON_COMPAT=( python3_{10..12} )
+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"
@@ -18,10 +18,9 @@ if [[ "${PV}" == 9999 ]] ; then
 		'-*'
 		3rdparty/cmake-compiler-flags
 		3rdparty/FindPythonInterpreter
-		3rdparty/gsl
+		3rdparty/flag-icons
 		3rdparty/minhook
-		3rdparty/opus
-		3rdparty/rnnoise-src
+		3rdparty/renamenoise
 		3rdparty/speexdsp
 		3rdparty/tracy
 	)
@@ -32,21 +31,23 @@ 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/_*}.src"
+		S="${WORKDIR}/${P/_*}"
 	fi
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+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]
@@ -61,7 +62,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
 	g15? ( app-misc/g15daemon:= )
 	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
@@ -98,10 +98,9 @@ src_configure() {
 
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
+		-Dbundled-gsl="OFF"
 		-Dbundled-json="OFF"
-		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
-		-Ddbus="$(usex dbus)"
 		-Dg15="$(usex g15)"
 		-Djackaudio="$(usex jack)"
 		-Doverlay="ON"
@@ -109,7 +108,7 @@ src_configure() {
 		-Doverlay-xcompile="$(usex multilib)"
 		-Dpipewire="$(usex pipewire)"
 		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
+		-Drenamenoise="$(usex rnnoise)"
 		-Dserver="OFF"
 		-Dspeechd="$(usex speech)"
 		-Dtests="$(usex test)"