summaryrefslogtreecommitdiff
path: root/net-voip
diff options
context:
space:
mode:
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/Manifest.gzbin1724 -> 1721 bytes
-rw-r--r--net-voip/mumble/Manifest11
-rw-r--r--net-voip/mumble/files/mumble-1.4-crypto-threads.patch131
-rw-r--r--net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch28
-rw-r--r--net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch24
-rw-r--r--net-voip/mumble/mumble-1.4.230-r3.ebuild149
-rw-r--r--net-voip/mumble/mumble-1.4.274-r1.ebuild (renamed from net-voip/mumble/mumble-1.4.274.ebuild)9
-rw-r--r--net-voip/mumble/mumble-9999.ebuild2
-rw-r--r--net-voip/murmur/Manifest10
-rw-r--r--net-voip/murmur/murmur-1.3.4.ebuild2
-rw-r--r--net-voip/murmur/murmur-1.4.230-r3.ebuild181
-rw-r--r--net-voip/murmur/murmur-1.4.274-r1.ebuild (renamed from net-voip/murmur/murmur-1.4.274.ebuild)8
-rw-r--r--net-voip/murmur/murmur-9999.ebuild2
13 files changed, 24 insertions, 533 deletions
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 1d9d9eaf7f1e..7868b7bd6b91 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
Binary files differ
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 12eb2fad1b91..948bf5a61536 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,12 +1,9 @@
-AUX mumble-1.4-crypto-threads.patch 6518 BLAKE2B 87d9ca8879cd09b8f29d0942ae84dfe4de7ab0216f50f2ff7f8b2802017802083b38793f9703de3bc4de1a083fc17a353f5527405740c68d826e8e82092455cf SHA512 2d0fcb11005f52b58d5dc43ac421fcccd9204a3ead36e0d4b4e1893818bcb9bf509d1459c358c0a8d02b0ff749738a262b9fe321e049bd65d8b2a2b441603d99
-AUX mumble-1.4.230-gcc12-include-memory.patch 934 BLAKE2B 2cbcb1983687effdcb183f034f76f05106bb2757b278a001da64a6c6c37c593776f391a23d23023d8c8c28ff5a53b1df0e4f2fb597904dee450b36a88abb8cd2 SHA512 8d00e760e5b49acba50cd6637de990d3b16f493327110cf768aef9d11aa309372996bf8c5a8a49fa3e4364dfec5f1611f855efe05284d9b388d3184e012278d5
-AUX mumble-1.4.230-poco-link-cmake.patch 476 BLAKE2B 91268125286d07820c98e941e443655b7edfb4f6c13815f988de8ed4ad50aa37fca557a88cee399418853cdd2e577f67acad7f8e3c2b7e1eefe8a64d4a26358c SHA512 9bab7ca52fd27f600215ceebac690ddae2702547a8519bdbb24be0df411a2ddd89750cfeeca77bcc47fec32b27526971a180519431b8e1637a224d902ec8de88
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.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
EBUILD mumble-1.3.4-r1.ebuild 3927 BLAKE2B 496adcaacc667be53b436748c49c506d0a79287e6623d90b24a2ca26b52840f96fc0317e60fceb9cc52293e1b18335fdb77b46e7fe6b9224f44f33dd51cc3082 SHA512 82de10280b9a1985cdb64aa5757325c856699a3f3ef97aca716c147c8ed5ee52e537b574bd5e0c1f2a4e37ed37732e185a478779aa3c981e5db2105bc54e3e20
-EBUILD mumble-1.4.230-r3.ebuild 3873 BLAKE2B b3fadb749ebfc81ca0a3e39d529df13108c3840d4270cdd66179deec3fcc0638e1fae3a21084a72b57a1cc82c375536e63cb18ee4cc3422eb630f6d903c17291 SHA512 25cc911d0613a6a0d963ce77d0075eb81cf667933e1c9d99e25413f76eaba703faa127f506804757270e644c7dd3ba7c93183f8f186b7ebc5bdf079e460e0623
-EBUILD mumble-1.4.274.ebuild 3764 BLAKE2B 6a7d402fd1fdc50a7469a745643dec73ce45e87a17f03bbca86a6242c9e8c8c6048bacc4b682d279c7b1c4e54d313ee182845777177077ad872c42015f0945da SHA512 7500f28ff7ea2c011e4214c572ae4103aab204d30640c1508bcabd37300ee65b3ba58b5ae7c5c983c2e0ec5bd084396b1fde3bf6c2b357ddce520050e560b5a8
-EBUILD mumble-9999.ebuild 3748 BLAKE2B a6130ee0a88b814639f02188c915a8a90e495f48ef357572d3099eed021615f13901d782315661630b47d85cf3744fb6c3a87650a2c1c3c2ed99dd8b2ea80e99 SHA512 ca87450df487f95ce49bdb4cf374862c0f281144ab89ec3dd03239acb51eaf3f2b7d8f423a3ff9c7590e32000b2ab34cc002cefd40cbb7091e3d703166db6cb1
+EBUILD mumble-1.4.274-r1.ebuild 3967 BLAKE2B 3956adc5e605a07029575be52e1aa2d79fc432af37a1329f4f1aad09acf2ddaf92267f5a7e98e8995c456672586086beb5df1a4a7ed97a6fdb65992662b22f03 SHA512 eb29bb626e8c5863d803b69d6cbc1975cb870041db8055ec6d250d23dc8d08a36ac8330979aff14d539b762a8177ad9ae8f1dc5de161cea9c08e8f50fe827fb8
+EBUILD mumble-9999.ebuild 3748 BLAKE2B 494387e429d711c3d377478cb43978c7df4f9a6c3242b15a80f30e390687d2b9bfa66123f500240fa2f7df74f4f0c7dc9fdc416d9436a8928e167801c19d883e SHA512 07c9d72d97e070881736142b1b82644f408f92f6541663fc72b0d8bd9083a046e9830159754e39ae40560ce5a06cbb3373541a93c4f6d7b266b2ed456e5837ce
MISC metadata.xml 729 BLAKE2B ebf94a9bcca010e62e9ad649805b25057cf9f18ce6d2e99f643b8d76ba97048d6dc68bc52358158c8eb208dcb0acc5c42c8267036d45a8c28bff2223afb3d9a5 SHA512 390ec775dfa1cf3106640fcac4f8fe57387586c98c1616dca6cc1d33a01ae4631e4263791f438116b4d2c0bbd605182da2d16d81dbc452ea4eb28645c0f35513
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..000000000000
--- a/net-voip/mumble/files/mumble-1.4-crypto-threads.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-commit f8d47db318f302f5a7d343f15c9936c7030c49c4
-Author: Terry Geng <terry@terriex.com>
-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 <cstring>
- #include <openssl/rand.h>
-
--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) {
- 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), &outlen, \
-- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
-- EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &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), &outlen, \
-+ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
-+ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
- }
--#define AESdecrypt(src, dst, key) \
-- { \
-- int outlen = 0; \
-- EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
-- EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
-- EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
-- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
-- EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
-+#define AESdecrypt_ctx(src, dst, key, dec_ctx) \
-+ { \
-+ int outlen = 0; \
-+ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
-+ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
-+ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
-+ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
-+ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
- }
-
-+#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_enc)
-+#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_enc)
-+
- bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
- const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
- keyblock checksum, delta, tmp, pad;
-@@ -345,6 +352,12 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
- return success;
- }
-
-+#undef AESencrypt
-+#undef AESdecrypt
-+
-+#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_dec)
-+#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_dec)
-+
- bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *plain, unsigned int len,
- const unsigned char *nonce, unsigned char *tag) {
- keyblock checksum, delta, tmp, pad;
-@@ -392,9 +405,9 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
- return success;
- }
-
-+#undef AESencrypt
-+#undef AESdecrypt
- #undef BLOCKSIZE
- #undef SHIFTBITS
- #undef SWAPPED
- #undef HIGHBIT
--#undef AESencrypt
--#undef AESdecrypt
-diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
-index cc3f1c0bc..0fd3000ad 100644
---- a/src/crypto/CryptStateOCB2.h
-+++ b/src/crypto/CryptStateOCB2.h
-@@ -44,8 +44,10 @@ private:
- unsigned char decrypt_iv[AES_BLOCK_SIZE];
- unsigned char decrypt_history[0x100];
-
-- EVP_CIPHER_CTX *enc_ctx;
-- EVP_CIPHER_CTX *dec_ctx;
-+ EVP_CIPHER_CTX *enc_ctx_ocb_enc;
-+ EVP_CIPHER_CTX *dec_ctx_ocb_enc;
-+ EVP_CIPHER_CTX *enc_ctx_ocb_dec;
-+ EVP_CIPHER_CTX *dec_ctx_ocb_dec;
- };
-
-
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..000000000000
--- 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 <slyich@gmail.com>
-Date: Sun, 27 Feb 2022 10:59:57 +0000
-Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> 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 '<memory>';
- did you forget to '#include <memory>'?
- 11 | #include <cstring>
- +++ |+#include <memory>
- 12 |
---- a/plugins/gtav/gtav.cpp
-+++ b/plugins/gtav/gtav.cpp
-@@ -9,6 +9,7 @@
- #include "mumble_positional_audio_utils.h"
-
- #include <cstring>
-+#include <memory>
-
- 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..000000000000
--- 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()
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..000000000000
--- 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}" == 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/~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"
- "${FILESDIR}/${PN}-1.4-crypto-threads.patch"
- "${FILESDIR}/${PN}-1.4.230-gcc12-include-memory.patch"
- "${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
-}
-
-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.274.ebuild b/net-voip/mumble/mumble-1.4.274-r1.ebuild
index 299b9c3392f3..b8308735543a 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}" == 9999 ]] ; 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,9 @@ 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-crypto-threads.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"
LICENSE="BSD MIT"
SLOT="0"
@@ -73,7 +75,8 @@ BDEPEND="
PATCHES=(
"${WORKDIR}/${PN}-1.4-openssl3.patch"
- "${FILESDIR}/${PN}-1.4-crypto-threads.patch"
+ "${WORKDIR}/${PN}-1.4-crypto-threads.patch"
+ "${WORKDIR}/${PN}-1.4-odr.patch"
)
pkg_setup() {
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index 548fe5b1e282..b25962c96656 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; 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}"
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index ec189c16f655..0f5ade81b945 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -5,12 +5,12 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a
AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
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.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b313b09d41ccfd356fe6735df7403c740d8e5549d1c72f51ec2ea310e0e16f318f5fe15c566ed8cbc278f85a8d396507fe2ac945ec1fa2756c2d9a9fafd0dc4f SHA512 18514c16c8cc8fcdb89cb101263b4b2cbb0649d3b7482d3cc9218cfcb5f6ed17b6f7ab2ec6655ac9743394e0c2229d2808ce0ce85bf70ed536121869a9e91cd9
-EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 68fd2ce435c1fd071ca24021f70710bce3e5f5867b6b9f9eba9582c48daccb03ae96087e9a960f752f4e5b018fe220f848d1377348bad4b80a7843c00de689bd SHA512 0eab4bb4e9264df6608dcc0b5bfbff2673337a785edee06da0507535e99b4148ecd53ecedca7f9e2396288ab78d512f373c3e9ba03ea7e6cd38935566ea099d5
-EBUILD murmur-1.4.230-r3.ebuild 4181 BLAKE2B b429b2aacf381ab9c719404f0600aee8cfb53be717132eff5c8fec75ea01e34d7d7485da0747b52bfc1d3558d4a9530b1ff71b48952db9d59b609c58cb81cfff SHA512 0e097031112f342483b34ea241edbd4606bf5e7ccd6b3b7be6dc9a189f66ff235b55de9f80f6e731c8f06f603be323d80318eb03ed80270b64aa523901d690c2
-EBUILD murmur-1.4.274.ebuild 4179 BLAKE2B 82232e700548cb1c9480be6d111d683cc759e454fcf43f23d045e844c390c0a7753804d3023d862c278a41bb684397c2a2b5906ff05a885c59dd5eff9dff8a12 SHA512 c788283dbffd8d4a72803e81af1532eb4c3670d5d471397d62a3a6fe5a65a9b86e14cafd99abb2624cf52d32efa6d9e21a2c70ee80a892e5a46d004bd69532d5
-EBUILD murmur-9999.ebuild 4105 BLAKE2B 485b4f5e48180f4ac85b7099aa21d02e06e0aa748c981c5312de12538968ed52ac4aa1962f18477325136b8c4bcabd575db9147c36c4f3818813f541141c7c36 SHA512 1546963c1e693b6570538ff2027e82c95274bcb2f279d94223a5e4413c26270440780fb7cb63bb7cef8dd51288834cc181906884c5dd9259716be5b0ba406fd8
+EBUILD murmur-1.3.4.ebuild 3718 BLAKE2B db7ce8908330f254914048dcce776016836386f929363325a5512ef168892eeb74e722c6b84a7d2e5f5f0049c39b085b271b4faf8029d5d9679a30bf5ec206c6 SHA512 16fdff5d182d27a6a5a197f2d9f6cbbce8099f327e0ebb37080fe59247cca75d5a2e6e0c2c9559de59ba6aa5d766947d881f254fe886bd771ed0ac879832c225
+EBUILD murmur-1.4.274-r1.ebuild 4432 BLAKE2B 1a2f7c5a653cc76e446152197416ce5ab4beccaec19927acd70755f0af6dd43425af5da4b39cecd642b8434a3f9e098105f3c8ec51b6f56d11c503a4f13d5c3b SHA512 bb415142afdf3b2739b02c72fd3428464ce9f04f7326d7136a526f06f67f98bfe2b6c8fc509a5bd37f502d0d20e08d2af8b12597512b54517561ebc47d03edab
+EBUILD murmur-9999.ebuild 4105 BLAKE2B d5d00f829565d2be493d14f211d7d4c02e53039006dbf6daba74f1a03bf346540a72b740e62e13273b33e5549fa9e3af6f43f277ede3fc8b95908db79700063b SHA512 831ebc6832f3c485653c0f718710decd6ea344c13b2a227ee436751c1c81629ce8f62967eb1820d02f898f4a4aa69ababa86f4cc7b0a6d28a4617ab33f3c56c4
MISC metadata.xml 532 BLAKE2B 033c64eda04542535df56a2ab4daedb41367f776873b757610e41a7afc450cc8acc2679f07dc749a75c82b6ac2b904fe8d63afa2ca6f017263d0230269e7bc78 SHA512 7ec514d46eb13c349514504ba976f8f787202497354515be2535793d3b1a9e287c210b861bec5778ce7d6de17aa40819c1520e58642ddc384cae6d009c193c24
diff --git a/net-voip/murmur/murmur-1.3.4.ebuild b/net-voip/murmur/murmur-1.3.4.ebuild
index a2034bc55449..ca290765cecc 100644
--- a/net-voip/murmur/murmur-1.3.4.ebuild
+++ b/net-voip/murmur/murmur-1.3.4.ebuild
@@ -24,7 +24,7 @@ else
https://dl.mumble.info/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV/_*}"
fi
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
fi
LICENSE="BSD"
diff --git a/net-voip/murmur/murmur-1.4.230-r3.ebuild b/net-voip/murmur/murmur-1.4.230-r3.ebuild
deleted file mode 100644
index f57c3e0b18ef..000000000000
--- a/net-voip/murmur/murmur-1.4.230-r3.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
-
-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=( '-*' )
-else
- MY_PN="mumble"
- if [[ "${PV}" == *_pre* ]] ; then
- MY_P="${MY_PN}-${PV}"
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
- else
- MY_PV="${PV/_/-}"
- MY_P="${MY_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}/${MY_PN}-${PV/_*}.src"
- fi
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus grpc +ice test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/murmur
- acct-user/murmur
- >=dev-libs/openssl-1.0.0b:0=
- >=dev-libs/protobuf-2.2.0:=
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- || (
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtsql:5[mysql]
- )
- dev-qt/qtxml:5
- sys-apps/lsb-release
- >=sys-libs/libcap-2.15
- dbus? ( dev-qt/qtdbus:5 )
- grpc? ( net-libs/grpc )
- ice? ( dev-libs/Ice:= )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.41.0
- dev-qt/qttest:5
-"
-BDEPEND="
- acct-group/murmur
- acct-user/murmur
- virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
- # Required for the mkini.sh script which calls perl multiple times
- BDEPEND+="
- dev-lang/perl
- "
-fi
-
-DOC_CONTENTS="
- Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
- Please execute:\n
- murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
- chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
- to set the build-in 'SuperUser' password before starting murmur.
- Please restart dbus before starting murmur, or else dbus
- registration will fail.
-"
-
-PATCHES=(
- "${WORKDIR}/mumble-1.4-openssl3.patch"
-)
-
-src_prepare() {
- if [[ "${PV}" == *9999 ]] ; then
- pushd scripts &>/dev/null || die
- ./mkini.sh || die
- popd &>/dev/null || die
- fi
-
- sed \
- -e 's:mumble-server:murmur:g' \
- -e 's:/var/run:/run:g' \
- -i "${S}"/scripts/murmur.{conf,ini} || die
-
- # Adjust systemd service file to our config location #689208
- sed \
- -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
- -e "s@murmurd@mumble-server@" \
- -i scripts/${PN}.service || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- myuse() {
- [[ -n "${1}" ]] || die "myconf: No use flag given."
- use ${1} || echo "no-${1}"
- }
- local mycmakeargs=(
- -DBUILD_TESTING="$(usex test)"
- -Dclient="OFF"
- -Ddbus="$(usex dbus)"
- -Dg15="OFF"
- -Dgrpc="$(usex grpc)"
- -Dice="$(usex ice)"
- -Doverlay="OFF"
- -Dserver="ON"
- -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
-
- dodoc README.md CHANGES
-
- docinto scripts
- dodoc -r scripts/server
- docompress -x /usr/share/doc/${PF}/scripts
-
- local etcdir="/etc/murmur"
- insinto ${etcdir}
- doins scripts/${PN}.ini
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/murmur.logrotate murmur
-
- insinto /etc/dbus-1/system.d/
- doins scripts/murmur.conf
-
- insinto /usr/share/murmur/
- doins src/murmur/Murmur.ice
-
- newinitd "${FILESDIR}"/murmur.initd-r2 murmur
- newconfd "${FILESDIR}"/murmur.confd murmur
-
- systemd_dounit scripts/${PN}.service
- newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
- keepdir /var/lib/murmur /var/log/murmur
- fowners -R murmur /var/lib/murmur /var/log/murmur
- fperms 750 /var/lib/murmur /var/log/murmur
-
- # Fix permissions on config file as it might contain passwords.
- # (bug #559362)
- fowners root:murmur ${etcdir}/murmur.ini
- fperms 640 ${etcdir}/murmur.ini
-
- doman man/murmurd.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
- readme.gentoo_print_elog
-}
diff --git a/net-voip/murmur/murmur-1.4.274.ebuild b/net-voip/murmur/murmur-1.4.274-r1.ebuild
index 2f572ab1a86e..6261b3912022 100644
--- a/net-voip/murmur/murmur-1.4.274.ebuild
+++ b/net-voip/murmur/murmur-1.4.274-r1.ebuild
@@ -15,7 +15,7 @@ else
MY_PN="mumble"
if [[ "${PV}" == *_pre* ]] ; then
MY_P="${MY_PN}-${PV}"
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
else
MY_PV="${PV/_/-}"
@@ -27,7 +27,9 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz"
LICENSE="BSD"
SLOT="0"
@@ -83,6 +85,8 @@ DOC_CONTENTS="
PATCHES=(
"${WORKDIR}/mumble-1.4-openssl3.patch"
+ "${WORKDIR}/mumble-1.4-crypto-threads.patch"
+ "${WORKDIR}/mumble-1.4-odr.patch"
)
src_prepare() {
diff --git a/net-voip/murmur/murmur-9999.ebuild b/net-voip/murmur/murmur-9999.ebuild
index 13d53c0b08f9..460402fde599 100644
--- a/net-voip/murmur/murmur-9999.ebuild
+++ b/net-voip/murmur/murmur-9999.ebuild
@@ -15,7 +15,7 @@ else
MY_PN="mumble"
if [[ "${PV}" == *_pre* ]] ; then
MY_P="${MY_PN}-${PV}"
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}"
else
MY_PV="${PV/_/-}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 18:09:27 +0000