gentoo auto-resync : 06:12:2022 - 21:11:24

5 files changed, 39 insertions, 154 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 171c303680e3..adb45561a330 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index dbde3afd3320..fb5bda864bd1 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,11 +1,10 @@
+AUX mumble-1.4-force-alignment.patch 890 BLAKE2B 43127c740b0ef7dabc205902ff080c3a7019bdac8b9518b6b9288799ed42300f9bf5a817f268f53cc41ce4b3d968a71e2801a03f4e76fb9420659c624444abf1 SHA512 3176bd137c472cc62a0ba6442f736a7f7e4a1809e0c8f7ffa83b48708f462f7c593e67a7aba343f9750daad6e6b0d50a5281a0fbde98048b11ddc5e9249681b3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
 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.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
 DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 EBUILD mumble-1.3.4-r1.ebuild 3918 BLAKE2B 72a351f43bb49953dfb6c734de77dcd63be900fc806db30d411faae1077ca116b69a38364ca5d9f241bc070f12add5e40d6f4fbf4b9b80a265c7543fc21db44d SHA512 ee1c02a0dc5180112cc17efc826b56a635f7c5dbd476d417d2db155456ee6ebca283a55b168f46f2fd8f28d91e1e62e2e51bf0e040bc84d257c7384bcbeb896b
-EBUILD mumble-1.4.274-r1.ebuild 3958 BLAKE2B d47edfb82534b71c5db12071094730d5cd556540f32e11094b8b269e701fe8bd9b120d68cfffd05a67865543724bc0f94c65e53e554ee26d1299f82a974104fe SHA512 0250ff63bf995dc2a9783676092233a911d950be01d2e18c784bed8bda6a7284f4e2f55a9a7393d56f3f4bc686f81f6416c901e2458dae2954dbbbdec2ae245b
-EBUILD mumble-1.4.287.ebuild 3956 BLAKE2B 0ec9f3e8408b4b49ed3763bfb054a54dce33bb776ba304a80ac84ffbd2acaa9b20d889be4082891e1f99e0e64541367e04d8a8bf02711f536a7723c8f617a82e SHA512 351084c486853ad6e50b9775ea7ec6f0d33b1944869b286e90d3bcfb6cef92e84e75de8a7a6913dcd34981f70b87552b5b4aa41ec81e9ddeaabbe87d1fd07291
+EBUILD mumble-1.4.287-r1.ebuild 4138 BLAKE2B 3411ff919cc6957cb492241a281a969ba2e1080ca2162acec63d605a570033696a7be193456bee43c5018a2734208bc0ad7ff91acebb7ffefb095f3d867b0709 SHA512 f33fd290b46db0927c4350e205196f6657c1c9d76098537af6583fad3bb960a7134a75f5133be0dc0038aa35d686edd1ca41b6fd516a547c9decfa6be0c8f217
 EBUILD mumble-9999.ebuild 4167 BLAKE2B 0c4233420ebcf7e29c2bcc8ef113d1aa62be990886089e8661bb657aa0f6315f51c529f7a2959e122267b40d33c7aeda5cd6cb822b8956b6864621080bb513e2 SHA512 9d23fdd7464a93ce088e00f46685469f90cb8ea87241dde7b754e4fc996fb283284dc97e957ac06e58581595dd22bb69a39b2297c586d4143ca59d75d9381f53
 MISC metadata.xml 729 BLAKE2B ebf94a9bcca010e62e9ad649805b25057cf9f18ce6d2e99f643b8d76ba97048d6dc68bc52358158c8eb208dcb0acc5c42c8267036d45a8c28bff2223afb3d9a5 SHA512 390ec775dfa1cf3106640fcac4f8fe57387586c98c1616dca6cc1d33a01ae4631e4263791f438116b4d2c0bbd605182da2d16d81dbc452ea4eb28645c0f35513
diff --git a/net-voip/mumble/files/mumble-1.4-force-alignment.patch b/net-voip/mumble/files/mumble-1.4-force-alignment.patch
new file mode 100644
index 000000000000..ea0ae4792443
--- /dev/null
+++ b/net-voip/mumble/files/mumble-1.4-force-alignment.patch
@@ -0,0 +1,28 @@
+From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001
+From: Davide Beatrici <git@davidebeatrici.dev>
+Date: Thu, 1 Sep 2022 23:32:57 +0200
+Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for
+ CCameraAngles in GTAV plugin
+
+https://en.cppreference.com/w/cpp/language/alignas
+
+This fixes compilation when the implicit alignment is not 8 bytes.
+
+It can be the case with 32 bit targets.
+---
+ plugins/gtav/structs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h
+index 2829dc11e1..0e4f76edab 100644
+--- a/plugins/gtav/structs.h
++++ b/plugins/gtav/structs.h
+@@ -118,7 +118,7 @@ struct CCameraManagerAngles {
+ 	ptr_t cameraAngles; // CCameraAngles *
+ };
+ 
+-struct CCameraAngles {
++struct alignas(8) CCameraAngles {
+ 	uint8_t pad1[960];
+ 	ptr_t playerAngles; // CPlayerAngles *
+ 	uint8_t pad2[60];
diff --git a/net-voip/mumble/mumble-1.4.274-r1.ebuild b/net-voip/mumble/mumble-1.4.274-r1.ebuild
deleted file mode 100644
index 08b3bc461d90..000000000000
--- a/net-voip/mumble/mumble-1.4.274-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic 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"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
-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}/${PN}-src"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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/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 )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon:= )
-	jack? ( virtual/jack )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	pipewire? ( media-video/pipewire )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-1.4-openssl3.patch"
-	"${WORKDIR}/${PN}-1.4-crypto-threads.patch"
-	"${WORKDIR}/${PN}-1.4-odr.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# required because of xdg.eclass also providing src_prepare
-	cmake_src_prepare
-}
-
-src_configure() {
-
-	local mycmakeargs=(
-		-Dalsa="$(usex alsa)"
-		-Dtests="$(usex test)"
-		-Dbundled-celt="ON"
-		-Dbundled-opus="OFF"
-		-Dbundled-speex="OFF"
-		-Ddbus="$(usex dbus)"
-		-Dg15="$(usex g15)"
-		-Djackaudio="$(usex jack)"
-		-Doverlay="ON"
-		-Dportaudio="$(usex portaudio)"
-		-Doverlay-xcompile="$(usex multilib)"
-		-Dpipewire="$(usex pipewire)"
-		-Dpulseaudio="$(usex pulseaudio)"
-		-Drnnoise="$(usex rnnoise)"
-		-Dserver="OFF"
-		-Dspeechd="$(usex speech)"
-		-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-1.4.287.ebuild b/net-voip/mumble/mumble-1.4.287-r1.ebuild
index 58bb301f3470..e6a44aaed687 100644
--- a/net-voip/mumble/mumble-1.4.287.ebuild
+++ b/net-voip/mumble/mumble-1.4.287-r1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P}.src"
 	fi
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"
@@ -77,6 +77,7 @@ PATCHES=(
 	"${WORKDIR}/${PN}-1.4-openssl3.patch"
 	"${WORKDIR}/${PN}-1.4-crypto-threads.patch"
 	"${WORKDIR}/${PN}-1.4-odr.patch"
+	"${FILESDIR}/${PN}-1.4-force-alignment.patch"
 )
 
 pkg_setup() {
@@ -124,6 +125,13 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	# https://bugs.gentoo.org/884049
+	# increase timeout for tests
+	local -x QTEST_FUNCTION_TIMEOUT=600000
+	cmake_src_test
+}
+
 src_install() {
 	cmake_src_install