summaryrefslogtreecommitdiff
path: root/packages/voip/mumble/files
diff options
context:
space:
mode:
Diffstat (limited to 'packages/voip/mumble/files')
-rw-r--r--packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch29
-rw-r--r--packages/voip/mumble/files/crosscompiling.patch22
-rw-r--r--packages/voip/mumble/files/gcc.patch12
-rw-r--r--packages/voip/mumble/files/higher_opus_complexity.patch12
-rw-r--r--packages/voip/mumble/files/tls12_strong_ciphers.patch41
5 files changed, 116 insertions, 0 deletions
diff --git a/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch b/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch
new file mode 100644
index 0000000..87aaee0
--- /dev/null
+++ b/packages/voip/mumble/files/allow_higher_bitrate_and_frame_size.patch
@@ -0,0 +1,29 @@
+diff --git a/src/mumble/AudioInput.ui b/src/mumble/AudioInput.ui
+index f2a67a5b..b250b3b7 100644
+--- a/src/mumble/AudioInput.ui
++++ b/src/mumble/AudioInput.ui
+@@ -483,7 +483,7 @@
+ <number>8000</number>
+ </property>
+ <property name="maximum">
+- <number>96000</number>
++ <number>128000</number>
+ </property>
+ <property name="singleStep">
+ <number>1000</number>
+@@ -534,11 +534,14 @@
+ <number>1</number>
+ </property>
+ <property name="maximum">
+- <number>4</number>
++ <number>6</number>
+ </property>
+ <property name="pageStep">
+ <number>2</number>
+ </property>
++ <property name="value">
++ <number>6</number>
++ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
diff --git a/packages/voip/mumble/files/crosscompiling.patch b/packages/voip/mumble/files/crosscompiling.patch
new file mode 100644
index 0000000..c666f0b
--- /dev/null
+++ b/packages/voip/mumble/files/crosscompiling.patch
@@ -0,0 +1,22 @@
+diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp
+index 7062ede6..3becca72 100644
+--- a/src/mumble/main.cpp
++++ b/src/mumble/main.cpp
+@@ -662,7 +662,7 @@ int main(int argc, char **argv) {
+ }
+
+ #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG)
+-extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &);
++//extern void qWinMain(HINSTANCE, HINSTANCE, LPSTR, int, int &, QVector<char *> &);
+
+ extern "C" __declspec(dllexport) int MumbleMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdArg, int cmdShow) {
+ Q_UNUSED(cmdArg);
+@@ -672,7 +672,7 @@ extern "C" __declspec(dllexport) int MumbleMain(HINSTANCE instance, HINSTANCE pr
+
+ // qWinMain takes argv as a reference.
+ QVector<char *> argv;
+- qWinMain(instance, prevInstance, cmdParam.data(), cmdShow, argc, argv);
++// qWinMain(instance, prevInstance, cmdParam.data(), cmdShow, argc, argv);
+
+ int result = main(argc, argv.data());
+ return result;
diff --git a/packages/voip/mumble/files/gcc.patch b/packages/voip/mumble/files/gcc.patch
new file mode 100644
index 0000000..12d2851
--- /dev/null
+++ b/packages/voip/mumble/files/gcc.patch
@@ -0,0 +1,12 @@
+diff --git a/src/SSLCipherInfo.h b/src/SSLCipherInfo.h
+index 508db61..2889b82 100644
+--- a/src/SSLCipherInfo.h
++++ b/src/SSLCipherInfo.h
+@@ -30,6 +30,7 @@
+
+ #ifndef MUMBLE_SSLCIPHERINFO_H_
+ #define MUMBLE_SSLCIPHERINFO_H_
++#include <string.h>
+
+ struct SSLCipherInfo {
+ const char *openssl_name;
diff --git a/packages/voip/mumble/files/higher_opus_complexity.patch b/packages/voip/mumble/files/higher_opus_complexity.patch
new file mode 100644
index 0000000..6a271ef
--- /dev/null
+++ b/packages/voip/mumble/files/higher_opus_complexity.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
+index 62f6244e..afb95568 100644
+--- a/src/mumble/AudioInput.cpp
++++ b/src/mumble/AudioInput.cpp
+@@ -95,6 +95,7 @@ AudioInput::AudioInput() : opusBuffer(g.s.iFramesPerPacket * (SAMPLE_RATE / 100)
+ }
+
+ opus_encoder_ctl(opusState, OPUS_SET_VBR(0)); // CBR
++ opus_encoder_ctl(opusState, OPUS_SET_COMPLEXITY(10)); //common, this should work just fine on high end gamer machine (and on low and too ...)
+ #endif
+
+ qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize);
diff --git a/packages/voip/mumble/files/tls12_strong_ciphers.patch b/packages/voip/mumble/files/tls12_strong_ciphers.patch
new file mode 100644
index 0000000..5fab971
--- /dev/null
+++ b/packages/voip/mumble/files/tls12_strong_ciphers.patch
@@ -0,0 +1,41 @@
+diff --git a/src/Connection.cpp b/src/Connection.cpp
+index 5dc7443e..2287f174 100644
+--- a/src/Connection.cpp
++++ b/src/Connection.cpp
+@@ -27,7 +27,9 @@ Connection::Connection(QObject *p, QSslSocket *qtsSock) : QObject(p) {
+ qtsSocket->setParent(this);
+ iPacketLength = -1;
+ bDisconnectedEmitted = false;
+-
++#if QT_VERSION >= 0x050500
++ qtsSocket->setProtocol(QSsl::TlsV1_2OrLater);
++#endif
+ static bool bDeclared = false;
+ if (! bDeclared) {
+ bDeclared = true;
+diff --git a/src/SSL.cpp b/src/SSL.cpp
+index 7f7e8121..16cddd28 100644
+--- a/src/SSL.cpp
++++ b/src/SSL.cpp
+@@ -40,7 +40,7 @@ void MumbleSSL::destroy() {
+ }
+
+ QString MumbleSSL::defaultOpenSSLCipherString() {
+- return QLatin1String("EECDH+AESGCM:EDH+aRSA+AESGCM:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:AES256-SHA:AES128-SHA");
++ return QLatin1String("DHE-RSA-CHACHA20-POLY1305:DHE-RSA-CAMELLIA256-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384");
+ }
+
+ QList<QSslCipher> MumbleSSL::ciphersFromOpenSSLCipherString(QString cipherString) {
+diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
+index 7e30e76a..60c39121 100644
+--- a/src/mumble/ServerHandler.cpp
++++ b/src/mumble/ServerHandler.cpp
+@@ -335,7 +335,7 @@ void ServerHandler::run() {
+
+
+ #if QT_VERSION >= 0x050500
+- qtsSock->setProtocol(QSsl::TlsV1_0OrLater);
++ qtsSock->setProtocol(QSsl::TlsV1_2OrLater);
+ #elif QT_VERSION >= 0x050400
+ // In Qt 5.4, QSsl::SecureProtocols is equivalent
+ // to "TLSv1.0 or later", which we require.