From b052fbf151106a4f47cac7fdf0ffff983decb773 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 1 Sep 2022 19:24:10 +0100 Subject: gentoo auto-resync : 01:09:2022 - 19:24:10 --- net-voip/mumble/Manifest | 11 +- .../mumble/files/mumble-1.4-crypto-threads.patch | 131 ------------------ .../mumble-1.4.230-gcc12-include-memory.patch | 28 ---- .../files/mumble-1.4.230-poco-link-cmake.patch | 24 ---- net-voip/mumble/mumble-1.4.230-r3.ebuild | 149 -------------------- net-voip/mumble/mumble-1.4.274-r1.ebuild | 150 +++++++++++++++++++++ net-voip/mumble/mumble-1.4.274.ebuild | 147 -------------------- net-voip/mumble/mumble-9999.ebuild | 2 +- 8 files changed, 155 insertions(+), 487 deletions(-) delete mode 100644 net-voip/mumble/files/mumble-1.4-crypto-threads.patch delete mode 100644 net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch delete mode 100644 net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch delete mode 100644 net-voip/mumble/mumble-1.4.230-r3.ebuild create mode 100644 net-voip/mumble/mumble-1.4.274-r1.ebuild delete mode 100644 net-voip/mumble/mumble-1.4.274.ebuild (limited to 'net-voip/mumble') 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 -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) { - 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 -Date: Sun, 27 Feb 2022 10:59:57 +0000 -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..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 ' to start the OpenGL overlay (after starting mumble)." - echo -} diff --git a/net-voip/mumble/mumble-1.4.274-r1.ebuild b/net-voip/mumble/mumble-1.4.274-r1.ebuild new file mode 100644 index 000000000000..b8308735543a --- /dev/null +++ b/net-voip/mumble/mumble-1.4.274-r1.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}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" + EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter ) +else + if [[ "${PV}" == *_pre* ]] ; then + SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz" + else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz" + S="${WORKDIR}/${PN}-src" + fi + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz" + +LICENSE="BSD MIT" +SLOT="0" +IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/openssl-1.0.0b:0= + dev-libs/poco[util,xml,zip] + >=dev-libs/protobuf-2.2.0:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + >=media-libs/libsndfile-1.0.20[-minimal] + >=media-libs/opus-1.3.1 + >=media-libs/speex-1.2.0 + media-libs/speexdsp + sys-apps/lsb-release + x11-libs/libX11 + x11-libs/libXi + alsa? ( media-libs/alsa-lib ) + dbus? ( dev-qt/qtdbus:5 ) + g15? ( app-misc/g15daemon:= ) + jack? ( virtual/jack ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + pipewire? ( media-video/pipewire ) + speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-qt/qtconcurrent:5 + dev-qt/qttest:5 + >=dev-libs/boost-1.41.0 + x11-base/xorg-proto +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}/${PN}-1.4-openssl3.patch" + "${WORKDIR}/${PN}-1.4-crypto-threads.patch" + "${WORKDIR}/${PN}-1.4-odr.patch" +) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + # required because of xdg.eclass also providing src_prepare + cmake_src_prepare +} + +src_configure() { + + local mycmakeargs=( + -Dalsa="$(usex alsa)" + -Dtests="$(usex test)" + -Dbundled-celt="ON" + -Dbundled-opus="OFF" + -Dbundled-speex="OFF" + -Ddbus="$(usex dbus)" + -Dg15="$(usex g15)" + -Djackaudio="$(usex jack)" + -Doverlay="ON" + -Dportaudio="$(usex portaudio)" + -Doverlay-xcompile="$(usex multilib)" + -Dpipewire="$(usex pipewire)" + -Dpulseaudio="$(usex pulseaudio)" + -Drnnoise="$(usex rnnoise)" + -Dserver="OFF" + -Dspeechd="$(usex speech)" + -Dtranslations="$(usex nls)" + -Dupdate="OFF" + -Dwarnings-as-errors="OFF" + -Dzeroconf="$(usex zeroconf)" + ) + + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) + fi + + # https://bugs.gentoo.org/832978 + # fix tests (and possibly runtime issues) on arches with unsigned chars + append-cxxflags -fsigned-char + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use amd64 && use multilib ; then + # The 32bit overlay library gets built when multilib is enabled. + # Install it into the correct 32bit lib dir. + local libdir_64="/usr/$(get_libdir)/mumble" + local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble" + dodir ${libdir_32} + mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \ + "${ED}"/${libdir_32}/ || die + fi + + insinto /usr/share/mumble + doins -r samples +} + +pkg_postinst() { + xdg_pkg_postinst + echo + elog "Visit https://wiki.mumble.info/ for futher configuration instructions." + elog "Run 'mumble-overlay ' 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.ebuild deleted file mode 100644 index 299b9c3392f3..000000000000 --- a/net-voip/mumble/mumble-1.4.274.ebuild +++ /dev/null @@ -1,147 +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}/${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)" - -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 ' to start the OpenGL overlay (after starting mumble)." - echo -} diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild index 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}" -- cgit v1.2.3