[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: bec8b5cb32f5888049bc3e0b777d8acc5c2ecf52
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Jan 26 14:05:00 2024 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Fri Feb 9 14:40:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec8b5cb
net-voip/mumble: Update live ebuild
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30788
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index b5a027a596c1..7aba5eb04ba7 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -16,6 +16,7 @@ if [[ "${PV}" == ]] ; then
# even if these components may not be compiled in
EGIT_SUBMODULES=(
'-*'
+ 3rdparty/cmake-compiler-flags
3rdparty/FindPythonInterpreter
3rdparty/gsl
3rdparty/minhook
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 3a0b6aea3bcc3ebf5514e0411f9e0b4349d03c5c Author: Kenton Groombridge gentoo org> AuthorDate: Fri Feb 9 14:10:45 2024 + Commit: Kenton Groombridge gentoo org> CommitDate: Fri Feb 9 14:40:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0b6aea net-voip/mumble: update copyright year Signed-off-by: Kenton Groombridge gentoo.org> net-voip/mumble/mumble-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-voip/mumble/mumble-.ebuild b/net-voip/mumble/mumble-.ebuild index 7aba5eb04ba7..79e98b80ec73 100644 --- a/net-voip/mumble/mumble-.ebuild +++ b/net-voip/mumble/mumble-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: d1058a4d4068245cb9ca23ba4e70707af6f60d9b
Author: Kenton Groombridge gentoo org>
AuthorDate: Mon Aug 14 22:43:44 2023 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Mon Aug 14 22:43:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1058a4d
net-voip/mumble: drop 1.3.4-r1
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 -
net-voip/mumble/mumble-1.3.4-r1.ebuild | 169 -
2 files changed, 170 deletions(-)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index a0c44c11d7d9..e3a09445c321 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,4 +1,3 @@
-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
diff --git a/net-voip/mumble/mumble-1.3.4-r1.ebuild
b/net-voip/mumble/mumble-1.3.4-r1.ebuild
deleted file mode 100644
index 43fb2779ddc8..
--- a/net-voip/mumble/mumble-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit desktop multilib-build python-any-r1 qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
-HOMEPAGE="https://wiki.mumble.info;
-if [[ "${PV}" == ]] ; 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 )
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz;
- else
- MY_PV="${PV/_/-}"
- MY_P="${PN}-${MY_PV}"
-
SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
- https://dl.mumble.info/${MY_P}.tar.gz;
- S="${WORKDIR}/${P/_*}"
- fi
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack +opus oss pch portaudio pulseaudio +rnnoise
speech zeroconf"
-
-RDEPEND="
- 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
- >=dev-libs/protobuf-2.2.0:=
- >=media-libs/libsndfile-1.0.20[-minimal]
- >=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 )
- >=dev-libs/openssl-1.0.0b:0=
- opus? ( >=media-libs/opus-1.0.1 )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-libs/boost
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
- myuse() {
- [[ -n "${1}" ]] || die "myuse: No use option given"
- use ${1} || echo no-${1}
- }
-
- local conf_add=(
- bundled-celt
- no-bundled-opus
- no-bundled-speex
- no-embed-qt-translations
- no-server
- no-update
- $(myuse alsa)
- $(myuse dbus)
-
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: bd1ddc9bd7d9342ac914344f6a68ec4d112232f2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 29 09:29:40 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 11 18:21:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1ddc9b net-voip/mumble: Switch IUSE=pulseaudio to media-libs/libpulse Signed-off-by: Andreas Sturmlechner gentoo.org> net-voip/mumble/mumble-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-voip/mumble/mumble-.ebuild b/net-voip/mumble/mumble-.ebuild index ccc0f611212b..b5a027a596c1 100644 --- a/net-voip/mumble/mumble-.ebuild +++ b/net-voip/mumble/mumble-.ebuild @@ -64,7 +64,7 @@ RDEPEND=" g15? ( app-misc/g15daemon:= ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) pipewire? ( media-video/pipewire ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 9137fece21a227439e85675400514a0c2c70e629
Author: Kenton Groombridge gentoo org>
AuthorDate: Mon Mar 27 22:22:22 2023 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Mon Mar 27 22:22:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9137fece
net-voip/mumble: enable py3.11
Closes: https://bugs.gentoo.org/897152
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-1.3.4-r1.ebuild | 2 +-
net-voip/mumble/mumble-1.4.287-r1.ebuild | 2 +-
net-voip/mumble/mumble-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-voip/mumble/mumble-1.3.4-r1.ebuild
b/net-voip/mumble/mumble-1.3.4-r1.ebuild
index e5f42f007257..43fb2779ddc8 100644
--- a/net-voip/mumble/mumble-1.3.4-r1.ebuild
+++ b/net-voip/mumble/mumble-1.3.4-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit desktop multilib-build python-any-r1 qmake-utils xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild
b/net-voip/mumble/mumble-1.4.287-r1.ebuild
index 4ae5cd60a99c..006c163c720a 100644
--- a/net-voip/mumble/mumble-1.4.287-r1.ebuild
+++ b/net-voip/mumble/mumble-1.4.287-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake flag-o-matic python-any-r1 xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 49779fe2e71e..ccc0f611212b 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake flag-o-matic python-any-r1 xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: bb08835e67786939950085d6be6a264cecad4b82
Author: Kenton Groombridge gentoo org>
AuthorDate: Tue Dec 27 04:53:58 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Tue Dec 27 04:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb08835e
net-voip/mumble: update live ebuild
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-.ebuild | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index c6f9fc3576ea..2ddad477ef4d 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -16,14 +16,13 @@ if [[ "${PV}" == ]] ; then
# even if these components may not be compiled in
EGIT_SUBMODULES=(
'-*'
- themes/Mumble
3rdparty/FindPythonInterpreter
3rdparty/gsl
3rdparty/minhook
+ 3rdparty/opus
3rdparty/rnnoise-src
3rdparty/speexdsp
3rdparty/tracy
- opus
)
else
if [[ "${PV}" == *_pre* ]] ; then
@@ -124,11 +123,6 @@ src_configure() {
mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
fi
- # https://bugs.gentoo.org/879569
- # convert absolute install paths to relative paths to satisfy path
assertions
- mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="$(realpath --relative-to="${S}"
"${ED}"/usr/share/man)" )
- mycmakeargs+=( -DCMAKE_INSTALL_DOCDIR="$(realpath --relative-to="${S}"
"${ED}"/usr/share/doc/"${PF}")" )
-
# https://bugs.gentoo.org/832978
# fix tests (and possibly runtime issues) on arches with unsigned chars
append-cxxflags -fsigned-char
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: dff481b7b1d9bb1a2152b6d9facf5ed8788f886b
Author: Kenton Groombridge gentoo org>
AuthorDate: Tue Dec 6 20:00:44 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Tue Dec 6 20:00:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff481b7
net-voip/mumble: drop 1.4.274-r1
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 -
net-voip/mumble/mumble-1.4.274-r1.ebuild | 150 ---
2 files changed, 151 deletions(-)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 83c9c835c209..a0c44c11d7d9 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -2,5 +2,4 @@ DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B
bcde3fd859ec4faea06f996cd4c583af7c0b840
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
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..
--- 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}" == ]] ; 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}
-
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 5486061e35763e968ed48cd230c8a94d73e745db
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 6 19:48:55 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 6 19:48:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5486061e
net-voip/mumble: Stabilize 1.4.287-r1 amd64, #877665
Signed-off-by: Arthur Zamarin gentoo.org>
net-voip/mumble/mumble-1.4.287-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild
b/net-voip/mumble/mumble-1.4.287-r1.ebuild
index 47936b3fb1c0..e6a44aaed687 100644
--- a/net-voip/mumble/mumble-1.4.287-r1.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;
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: a076b5783d80e9c6e39b3b2653b5b400b412d0d2
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 6 19:45:02 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 6 19:45:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a076b578
net-voip/mumble: Stabilize 1.4.287-r1 x86, #877665
Signed-off-by: Arthur Zamarin gentoo.org>
net-voip/mumble/mumble-1.4.287-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild
b/net-voip/mumble/mumble-1.4.287-r1.ebuild
index 9bef3ee35ff6..47936b3fb1c0 100644
--- a/net-voip/mumble/mumble-1.4.287-r1.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;
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/files/, net-voip/mumble/
commit: 1fa9229b7486ee0986d3486cddd65e209d770084
Author: Kenton Groombridge gentoo org>
AuthorDate: Tue Dec 6 19:28:31 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Tue Dec 6 19:35:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa9229b
net-voip/mumble: fix 1.4.287 build on x86, increase tests timeout
Closes: https://bugs.gentoo.org/884049
Signed-off-by: Kenton Groombridge gentoo.org>
.../mumble/files/mumble-1.4-force-alignment.patch | 28 ++
...ble-1.4.287.ebuild => mumble-1.4.287-r1.ebuild} | 10 +++-
2 files changed, 37 insertions(+), 1 deletion(-)
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 ..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
+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.287.ebuild
b/net-voip/mumble/mumble-1.4.287-r1.ebuild
similarity index 94%
rename from net-voip/mumble/mumble-1.4.287.ebuild
rename to net-voip/mumble/mumble-1.4.287-r1.ebuild
index 58bb301f3470..9bef3ee35ff6 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=60
+ cmake_src_test
+}
+
src_install() {
cmake_src_install
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 846953b414d93d2f81a0b8e909057533bb089628
Author: Kenton Groombridge gentoo org>
AuthorDate: Tue Nov 15 14:45:31 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Tue Nov 15 14:49:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846953b4
net-voip/mumble: update live ebuild
Fix relative path assertions in the live ebuild as well as fix the
builtin license script breakage.
Bug: https://bugs.gentoo.org/879569
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-.ebuild | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 4d6f06e23171..c6f9fc3576ea 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -11,7 +11,20 @@ HOMEPAGE="https://wiki.mumble.info;
if [[ "${PV}" == ]] ; 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 3rdparty/tracy 3rdparty/gsl
)
+
+ # needed for the included 3rdparty license script,
+ # even if these components may not be compiled in
+ EGIT_SUBMODULES=(
+ '-*'
+ themes/Mumble
+ 3rdparty/FindPythonInterpreter
+ 3rdparty/gsl
+ 3rdparty/minhook
+ 3rdparty/rnnoise-src
+ 3rdparty/speexdsp
+ 3rdparty/tracy
+ opus
+ )
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz;
@@ -85,7 +98,6 @@ src_configure() {
local mycmakeargs=(
-Dalsa="$(usex alsa)"
- -Dbundled-celt="ON"
-Dbundled-json="OFF"
-Dbundled-opus="OFF"
-Dbundled-speex="OFF"
@@ -112,6 +124,11 @@ src_configure() {
mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
fi
+ # https://bugs.gentoo.org/879569
+ # convert absolute install paths to relative paths to satisfy path
assertions
+ mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="$(realpath --relative-to="${S}"
"${ED}"/usr/share/man)" )
+ mycmakeargs+=( -DCMAKE_INSTALL_DOCDIR="$(realpath --relative-to="${S}"
"${ED}"/usr/share/doc/"${PF}")" )
+
# https://bugs.gentoo.org/832978
# fix tests (and possibly runtime issues) on arches with unsigned chars
append-cxxflags -fsigned-char
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: ac261c54ff2ec8b16d4f3bb6a904da8220d9de77
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Oct 20 10:52:03 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Oct 20 10:52:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac261c54
net-voip/mumble: Stabilize 1.4.287 amd64, #877665
Signed-off-by: Jakov Smolić gentoo.org>
net-voip/mumble/mumble-1.4.287.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-voip/mumble/mumble-1.4.287.ebuild
b/net-voip/mumble/mumble-1.4.287.ebuild
index c16a3cc2adaf..58bb301f3470 100644
--- a/net-voip/mumble/mumble-1.4.287.ebuild
+++ b/net-voip/mumble/mumble-1.4.287.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;
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 4ee0a357c7f5ede876b8f70e029deb0b65b1e9d9
Author: Kenton Groombridge gentoo org>
AuthorDate: Sat Sep 17 16:44:43 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sat Sep 17 16:46:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee0a357
net-voip/mumble: add 1.4.287
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 +
net-voip/mumble/mumble-1.4.287.ebuild | 150 ++
2 files changed, 151 insertions(+)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index ba7d6f1036de..83c9c835c209 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -3,3 +3,4 @@ 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.274.tar.gz 9446657 BLAKE2B
db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660
SHA512
6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
+DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B
5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040
SHA512
34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
diff --git a/net-voip/mumble/mumble-1.4.287.ebuild
b/net-voip/mumble/mumble-1.4.287.ebuild
new file mode 100644
index ..c16a3cc2adaf
--- /dev/null
+++ b/net-voip/mumble/mumble-1.4.287.ebuild
@@ -0,0 +1,150 @@
+# 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}" == ]] ; 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}/${P}.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"
+
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 928ac3764a29e62d0dec711ec47463970ee4eb62
Author: David Seifert gentoo org>
AuthorDate: Sun Sep 4 13:03:22 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Sep 4 13:03:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=928ac376
net-voip/mumble: remove stale boost lower bounds
Signed-off-by: David Seifert gentoo.org>
net-voip/mumble/mumble-1.3.4-r1.ebuild | 2 +-
net-voip/mumble/mumble-1.4.274-r1.ebuild | 2 +-
net-voip/mumble/mumble-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-voip/mumble/mumble-1.3.4-r1.ebuild
b/net-voip/mumble/mumble-1.3.4-r1.ebuild
index b949aeef04ef..49af880adaca 100644
--- a/net-voip/mumble/mumble-1.3.4-r1.ebuild
+++ b/net-voip/mumble/mumble-1.3.4-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- >=dev-libs/boost-1.41.0
+ dev-libs/boost
x11-base/xorg-proto
"
BDEPEND="
diff --git a/net-voip/mumble/mumble-1.4.274-r1.ebuild
b/net-voip/mumble/mumble-1.4.274-r1.ebuild
index b8308735543a..08b3bc461d90 100644
--- a/net-voip/mumble/mumble-1.4.274-r1.ebuild
+++ b/net-voip/mumble/mumble-1.4.274-r1.ebuild
@@ -65,7 +65,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-qt/qtconcurrent:5
dev-qt/qttest:5
- >=dev-libs/boost-1.41.0
+ dev-libs/boost
x11-base/xorg-proto
"
BDEPEND="
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index b25962c96656..4d6f06e23171 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -62,7 +62,7 @@ DEPEND="${RDEPEND}
dev-cpp/nlohmann_json
dev-qt/qtconcurrent:5
dev-qt/qttest:5
- >=dev-libs/boost-1.41.0
+ dev-libs/boost
x11-base/xorg-proto
"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: ab93e23f412bc588c0ea60a06a0de67e0f405b53
Author: Kenton Groombridge gentoo org>
AuthorDate: Wed Aug 31 14:04:26 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Wed Aug 31 14:50:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab93e23f
net-voip/mumble: fix ODR violations
Closes: https://bugs.gentoo.org/861866
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest| 1 +
net-voip/mumble/{mumble-1.4.274.ebuild => mumble-1.4.274-r1.ebuild} | 6 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 877f4893c488..27dc4ec2cf4f 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,4 +1,5 @@
DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B
bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6
SHA512
e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
+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.230.tar.gz 9441667 BLAKE2B
da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26
SHA512
6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B
db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660
SHA512
6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
diff --git a/net-voip/mumble/mumble-1.4.274.ebuild
b/net-voip/mumble/mumble-1.4.274-r1.ebuild
similarity index 93%
rename from net-voip/mumble/mumble-1.4.274.ebuild
rename to net-voip/mumble/mumble-1.4.274-r1.ebuild
index 299b9c3392f3..7780adddc12b 100644
--- a/net-voip/mumble/mumble-1.4.274.ebuild
+++ b/net-voip/mumble/mumble-1.4.274-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == ]] ; then
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/~polynomial-c/dist/${P}.tar.xz;
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz;
else
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
@@ -24,7 +24,8 @@ else
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.4-openssl3.patch.xz;
+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-odr.patch.xz;
LICENSE="BSD MIT"
SLOT="0"
@@ -74,6 +75,7 @@ BDEPEND="
PATCHES=(
"${WORKDIR}/${PN}-1.4-openssl3.patch"
"${FILESDIR}/${PN}-1.4-crypto-threads.patch"
+ "${WORKDIR}/${PN}-1.4-odr.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 8d0128e83710d0e0b9264b4fba0afa8969ad7d80
Author: Kenton Groombridge gentoo org>
AuthorDate: Wed Aug 31 14:48:52 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Wed Aug 31 14:51:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0128e8
net-voip/mumble: update live ebuild
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 548fe5b1e282..b25962c96656 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == ]] ; then
EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble
3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy 3rdparty/gsl
)
else
if [[ "${PV}" == *_pre* ]] ; then
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz;
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz;
else
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/, net-voip/mumble/files/
commit: f1a4d26b145ab141e374a878321a89afb71feea0
Author: Kenton Groombridge gentoo org>
AuthorDate: Wed Aug 31 14:21:22 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Wed Aug 31 14:50:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a4d26b
net-voip/mumble: move crypto threads patch to dev space
This patch is also shared with net-voip/murmur.
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 +
.../mumble/files/mumble-1.4-crypto-threads.patch | 131 -
net-voip/mumble/mumble-1.4.274-r1.ebuild | 3 +-
3 files changed, 3 insertions(+), 132 deletions(-)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 6adcf87553bb..ba7d6f1036de 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,4 +1,5 @@
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
diff --git a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
b/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
deleted file mode 100644
index 0ad371cd6c63..
--- a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-commit f8d47db318f302f5a7d343f15c9936c7030c49c4
-Author: Terry Geng
-Date: Sun Dec 12 22:39:38 2021 -0500
-
-FIX(crypto): Sharing EVP context between threads crushes Mumble
-
-Functions ocb_encrypt and ocb_decrypt share the same set
-of encrypt and decrypt contexts. However, they are invoked
-in different threads (audio input thread and server
-handler thread).
-This may lead to conflicts that would crash Mumble.
-This patch separates contexts used in these two functions
-to avoid such conflicts.
-
-Fixes #5361
-
-diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
-index 640fdedac..3b3473ffe 100644
a/src/crypto/CryptStateOCB2.cpp
-+++ b/src/crypto/CryptStateOCB2.cpp
-@@ -30,7 +30,9 @@
- #include
- #include
-
--CryptStateOCB2::CryptStateOCB2() : CryptState(),
enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
-+CryptStateOCB2::CryptStateOCB2()
-+ : CryptState(), enc_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
dec_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
-+enc_ctx_ocb_dec(EVP_CIPHER_CTX_new()),
dec_ctx_ocb_dec(EVP_CIPHER_CTX_new()) {
- for (int i = 0; i < 0x100; i++)
- decrypt_history[i] = 0;
- memset(raw_key, 0, AES_KEY_SIZE_BYTES);
-@@ -39,8 +41,10 @@ CryptStateOCB2::CryptStateOCB2() : CryptState(),
enc_ctx(EVP_CIPHER_CTX_new()),
- }
-
- CryptStateOCB2::~CryptStateOCB2() noexcept {
-- EVP_CIPHER_CTX_free(enc_ctx);
-- EVP_CIPHER_CTX_free(dec_ctx);
-+ EVP_CIPHER_CTX_free(enc_ctx_ocb_enc);
-+ EVP_CIPHER_CTX_free(dec_ctx_ocb_enc);
-+ EVP_CIPHER_CTX_free(enc_ctx_ocb_dec);
-+ EVP_CIPHER_CTX_free(dec_ctx_ocb_dec);
- }
-
- bool CryptStateOCB2::isValid() const {
-@@ -257,25 +261,28 @@ static void inline ZERO(keyblock ) {
- block[i] = 0;
- }
-
--#define AESencrypt(src, dst, key)
\
-- {
\
-- int outlen = 0;
\
-- EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key,
NULL); \
--
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/files/
commit: 25ac22594b472987a75c1cb389fbb1ff9457542b
Author: Kenton Groombridge gentoo org>
AuthorDate: Wed Aug 31 14:20:40 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Wed Aug 31 14:50:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ac2259
net-voip/mumble/files: drop obsolete patches
Signed-off-by: Kenton Groombridge gentoo.org>
.../mumble-1.4.230-gcc12-include-memory.patch | 28 --
.../files/mumble-1.4.230-poco-link-cmake.patch | 24 ---
2 files changed, 52 deletions(-)
diff --git a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
b/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
deleted file mode 100644
index 624a8594d995..
--- a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca
-
-From: Sergei Trofimovich
-Date: Sun, 27 Feb 2022 10:59:57 +
-Subject: [PATCH] BUILD(positional-audio): Fix missing include
-
-Without the change the build fails on upcoming gcc-12 as:
-
-/build/mumble/plugins/gtav/gtav.cpp:13:13:
- error: 'unique_ptr' in namespace 'std' does not name a template type
- 13 | static std::unique_ptr< Game > game;
- | ^~
-/build/mumble/plugins/gtav/gtav.cpp:12:1:
- note: 'std::unique_ptr' is defined in header '';
-did you forget to '#include '?
- 11 | #include
- +++ |+#include
- 12 |
a/plugins/gtav/gtav.cpp
-+++ b/plugins/gtav/gtav.cpp
-@@ -9,6 +9,7 @@
- #include "mumble_positional_audio_utils.h"
-
- #include
-+#include
-
- static std::unique_ptr< Game > game;
-
diff --git a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch
b/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch
deleted file mode 100644
index d1b4dee11d51..
--- a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/842984
-https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030
-
-Fix underlinking against Poco.
a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -383,11 +383,16 @@ target_include_directories(mumble
- "${PLUGINS_DIR}"
- )
-
--find_pkg(Poco COMPONENTS Zip)
-+find_pkg(Poco
-+ COMPONENTS
-+ XML
-+ Zip
-+)
-
- if(TARGET Poco::Zip)
- target_link_libraries(mumble
- PRIVATE
-+ Poco::XML
- Poco::Zip
- )
- else()
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: b7760052b75799d7a1ce6e994baa35330b589a99
Author: Kenton Groombridge gentoo org>
AuthorDate: Wed Aug 31 14:05:19 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Wed Aug 31 14:50:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7760052
net-voip/mumble: drop 1.4.230-r3
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 -
net-voip/mumble/mumble-1.4.230-r3.ebuild | 149 ---
2 files changed, 150 deletions(-)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 27dc4ec2cf4f..6adcf87553bb 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,5 +1,4 @@
DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B
bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6
SHA512
e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
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.230.tar.gz 9441667 BLAKE2B
da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26
SHA512
6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B
db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660
SHA512
6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
diff --git a/net-voip/mumble/mumble-1.4.230-r3.ebuild
b/net-voip/mumble/mumble-1.4.230-r3.ebuild
deleted file mode 100644
index 382e030edb65..
--- a/net-voip/mumble/mumble-1.4.230-r3.ebuild
+++ /dev/null
@@ -1,149 +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}" == ]] ; 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/~polynomial-c/dist/${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/_*}.src"
- fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.4-openssl3.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-1.41.0
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${WORKDIR}/${PN}-1.4-openssl3.patch"
-
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: bab161ae1fe36fcc0f0cac8de5cf20c8087c48f5
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Aug 21 21:03:56 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Aug 21 21:04:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab161ae
net-voip/mumble: add 1.4.274
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/Manifest | 1 +
net-voip/mumble/mumble-1.4.274.ebuild | 147 ++
2 files changed, 148 insertions(+)
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 0f2194f6c401..877f4893c488 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,3 +1,4 @@
DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B
bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6
SHA512
e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B
5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a
SHA512
3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B
da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26
SHA512
6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
+DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B
db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660
SHA512
6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
diff --git a/net-voip/mumble/mumble-1.4.274.ebuild
b/net-voip/mumble/mumble-1.4.274.ebuild
new file mode 100644
index ..299b9c3392f3
--- /dev/null
+++ b/net-voip/mumble/mumble-1.4.274.ebuild
@@ -0,0 +1,147 @@
+# 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}" == ]] ; 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/~polynomial-c/dist/${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/~polynomial-c/${PN}-1.4-openssl3.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-1.41.0
+ x11-base/xorg-proto
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${WORKDIR}/${PN}-1.4-openssl3.patch"
+ "${FILESDIR}/${PN}-1.4-crypto-threads.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)"
+
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 05f02cd130360d46919d4d0b82460ee4224731e3 Author: Sam James gentoo org> AuthorDate: Fri Jul 29 07:23:11 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jul 29 07:23:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f02cd1 net-voip/mumble: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-voip/mumble/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-voip/mumble/metadata.xml b/net-voip/mumble/metadata.xml index 4155b39a062c..89b0b7410868 100644 --- a/net-voip/mumble/metadata.xml +++ b/net-voip/mumble/metadata.xml @@ -12,6 +12,7 @@ Enable text-to-speech support in Mumble. + mumble-voip/mumble mumble
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 46e059e4c3b8048e0ff2f3a50647d6c49d0f9226
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Jul 3 18:37:42 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Jul 3 19:17:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e059e4
net-voip/mumble: append -fsigned-char to CXXFLAGS
This fixes tests (and possibly runtime issues) on arches with unsigned
chars.
Bug: https://bugs.gentoo.org/832978
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-1.4.230-r2.ebuild | 6 +-
net-voip/mumble/mumble-.ebuild | 6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/net-voip/mumble/mumble-1.4.230-r2.ebuild
b/net-voip/mumble/mumble-1.4.230-r2.ebuild
index 50d5964ae8fe..ee18ba0d74f9 100644
--- a/net-voip/mumble/mumble-1.4.230-r2.ebuild
+++ b/net-voip/mumble/mumble-1.4.230-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
HOMEPAGE="https://wiki.mumble.info;
@@ -110,6 +110,10 @@ src_configure() {
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
}
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 8973f0ef46ff..cbe94df0b160 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
HOMEPAGE="https://wiki.mumble.info;
@@ -106,6 +106,10 @@ src_configure() {
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
}
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 06a6439e0d67db49c759afcbee6fe3e20d129856
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Jul 3 18:42:06 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Jul 3 19:17:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a6439e
net-voip/mumble: inherit python-any-r1
Mumble's build system requires a Python interpreter to be present when
building its bundled translations.
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-1.4.230-r2.ebuild | 8 +++-
net-voip/mumble/mumble-.ebuild | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/net-voip/mumble/mumble-1.4.230-r2.ebuild
b/net-voip/mumble/mumble-1.4.230-r2.ebuild
index ee18ba0d74f9..382e030edb65 100644
--- a/net-voip/mumble/mumble-1.4.230-r2.ebuild
+++ b/net-voip/mumble/mumble-1.4.230-r2.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-inherit cmake flag-o-matic xdg
+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;
@@ -59,6 +60,7 @@ RDEPEND="
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
"
DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
dev-qt/qtconcurrent:5
dev-qt/qttest:5
>=dev-libs/boost-1.41.0
@@ -76,6 +78,10 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch"
)
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
# required because of xdg.eclass also providing src_prepare
cmake_src_prepare
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index cbe94df0b160..548fe5b1e282 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-inherit cmake flag-o-matic xdg
+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;
@@ -57,6 +58,7 @@ RDEPEND="
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
"
DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
dev-cpp/nlohmann_json
dev-qt/qtconcurrent:5
dev-qt/qttest:5
@@ -68,6 +70,10 @@ BDEPEND="
virtual/pkgconfig
"
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 0a2f1babe65db90aea2f1eb4aa8d755be1d1e0a1
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Jul 3 19:10:14 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Jul 3 19:17:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2f1bab
net-voip/mumble: bump revision
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/{mumble-1.3.4.ebuild => mumble-1.3.4-r1.ebuild}| 0
net-voip/mumble/{mumble-1.4.230-r2.ebuild => mumble-1.4.230-r3.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-voip/mumble/mumble-1.3.4.ebuild
b/net-voip/mumble/mumble-1.3.4-r1.ebuild
similarity index 100%
rename from net-voip/mumble/mumble-1.3.4.ebuild
rename to net-voip/mumble/mumble-1.3.4-r1.ebuild
diff --git a/net-voip/mumble/mumble-1.4.230-r2.ebuild
b/net-voip/mumble/mumble-1.4.230-r3.ebuild
similarity index 100%
rename from net-voip/mumble/mumble-1.4.230-r2.ebuild
rename to net-voip/mumble/mumble-1.4.230-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: 0620d7b3ade4d75cdd4a218da7054250d05c7a01
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Jul 3 17:59:57 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Jul 3 19:17:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0620d7b3
net-voip/mumble: install included samples
Install the default samples included with mumble for messages and
notifications.
Closes: https://bugs.gentoo.org/477068
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-1.3.4.ebuild | 3 +++
net-voip/mumble/mumble-1.4.230-r2.ebuild | 3 +++
net-voip/mumble/mumble-.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/net-voip/mumble/mumble-1.3.4.ebuild
b/net-voip/mumble/mumble-1.3.4.ebuild
index b34bfa5eec22..b949aeef04ef 100644
--- a/net-voip/mumble/mumble-1.3.4.ebuild
+++ b/net-voip/mumble/mumble-1.3.4.ebuild
@@ -147,6 +147,9 @@ src_install() {
doman man/mumble-overlay.1
doman man/mumble.1
+
+ insinto /usr/share/mumble
+ doins -r samples
}
pkg_preinst() {
diff --git a/net-voip/mumble/mumble-1.4.230-r2.ebuild
b/net-voip/mumble/mumble-1.4.230-r2.ebuild
index 1eb64420e4ac..50d5964ae8fe 100644
--- a/net-voip/mumble/mumble-1.4.230-r2.ebuild
+++ b/net-voip/mumble/mumble-1.4.230-r2.ebuild
@@ -125,6 +125,9 @@ src_install() {
mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
"${ED}"/${libdir_32}/ || die
fi
+
+ insinto /usr/share/mumble
+ doins -r samples
}
pkg_postinst() {
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 626701f07875..8973f0ef46ff 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -121,6 +121,9 @@ src_install() {
mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
"${ED}"/${libdir_32}/ || die
fi
+
+ insinto /usr/share/mumble
+ doins -r samples
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/files/, net-voip/mumble/
commit: 10bdd9eb10ccaecab63972168b3802e6e2f00127
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun Jul 3 02:43:00 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun Jul 3 02:49:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10bdd9eb
net-voip/mumble: backport crypto thread patch for 1.4.230
The backported patch to migrate to the OpenSSL 3.0-compatible API
introduces a sporadic crash. Backport the upstream patch at commit
f8d47db318f302f5a7d343f15c9936c7030c49c4 to fix this issue.
Signed-off-by: Kenton Groombridge gentoo.org>
.../mumble/files/mumble-1.4-crypto-threads.patch | 131 +
...-1.4.230-r1.ebuild => mumble-1.4.230-r2.ebuild} | 1 +
2 files changed, 132 insertions(+)
diff --git a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
b/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
new file mode 100644
index ..0ad371cd6c63
--- /dev/null
+++ b/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
@@ -0,0 +1,131 @@
+commit f8d47db318f302f5a7d343f15c9936c7030c49c4
+Author: Terry Geng
+Date: Sun Dec 12 22:39:38 2021 -0500
+
+FIX(crypto): Sharing EVP context between threads crushes Mumble
+
+Functions ocb_encrypt and ocb_decrypt share the same set
+of encrypt and decrypt contexts. However, they are invoked
+in different threads (audio input thread and server
+handler thread).
+This may lead to conflicts that would crash Mumble.
+This patch separates contexts used in these two functions
+to avoid such conflicts.
+
+Fixes #5361
+
+diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
+index 640fdedac..3b3473ffe 100644
+--- a/src/crypto/CryptStateOCB2.cpp
b/src/crypto/CryptStateOCB2.cpp
+@@ -30,7 +30,9 @@
+ #include
+ #include
+
+-CryptStateOCB2::CryptStateOCB2() : CryptState(),
enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
++CryptStateOCB2::CryptStateOCB2()
++ : CryptState(), enc_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
dec_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
++enc_ctx_ocb_dec(EVP_CIPHER_CTX_new()),
dec_ctx_ocb_dec(EVP_CIPHER_CTX_new()) {
+ for (int i = 0; i < 0x100; i++)
+ decrypt_history[i] = 0;
+ memset(raw_key, 0, AES_KEY_SIZE_BYTES);
+@@ -39,8 +41,10 @@ CryptStateOCB2::CryptStateOCB2() : CryptState(),
enc_ctx(EVP_CIPHER_CTX_new()),
+ }
+
+ CryptStateOCB2::~CryptStateOCB2() noexcept {
+- EVP_CIPHER_CTX_free(enc_ctx);
+- EVP_CIPHER_CTX_free(dec_ctx);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_dec);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_dec);
+ }
+
+ bool CryptStateOCB2::isValid() const {
+@@ -257,25 +261,28 @@ static void inline ZERO(keyblock ) {
+ block[i] = 0;
+ }
+
+-#define AESencrypt(src, dst, key)
\
+- {
\
+- int outlen = 0;
\
+- EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key,
NULL); \
+- EVP_CIPHER_CTX_set_padding(enc_ctx, 0);
\
+- EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char *
>(dst), , \
+-reinterpret_cast< const
unsigned char * >(src), AES_BLOCK_SIZE);\
+- EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char *
>(dst + outlen), ); \
++#define AESencrypt_ctx(src, dst, key, enc_ctx)
\
++ {
\
++ int outlen = 0;
\
++ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key,
NULL);\
++ EVP_CIPHER_CTX_set_padding(enc_ctx, 0);
\
++ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char *
>(dst), , \
++reinterpret_cast< const
unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char *
>((dst) + outlen), ); \
+ }
+-#define AESdecrypt(src, dst, key)
\
+- {
\
+- int outlen = 0;
\
+- EVP_DecryptInit_ex(dec_ctx,
[gentoo-commits] repo/gentoo:master commit in: net-voip/mumble/
commit: a2aa064c8d3623acb30590e77b021887eb0928e9
Author: Kenton Groombridge gentoo org>
AuthorDate: Fri Jul 1 18:41:36 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Fri Jul 1 18:41:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2aa064c
net-voip/mumble: sync live ebuild
Signed-off-by: Kenton Groombridge gentoo.org>
net-voip/mumble/mumble-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-voip/mumble/mumble-.ebuild
b/net-voip/mumble/mumble-.ebuild
index 009f89b12418..626701f07875 100644
--- a/net-voip/mumble/mumble-.ebuild
+++ b/net-voip/mumble/mumble-.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info;
if [[ "${PV}" == ]] ; 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 3rdparty/tracy )
+ EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble
3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy 3rdparty/gsl
)
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz;
