commit: 6050e61b3963b7e7e084ba5e7d1622d939488169
Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
AuthorDate: Thu Sep 6 12:50:40 2018 +0000
Commit: gerion <gerion.entrup <AT> flump <DOT> de>
CommitDate: Thu Sep 6 12:50:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=6050e61b
media-sound/mumble: drop, jack is supported upstream now
media-sound/mumble/Manifest | 6 -
.../files/mumble-1.2.4-speech-dispatcher.patch | 49 ---
media-sound/mumble/files/mumble-1.2.8-gcc49.patch | 26 --
media-sound/mumble/files/mumble-jack-support.patch | 455 ---------------------
media-sound/mumble/metadata.xml | 18 -
media-sound/mumble/mumble-1.2.19-r1.ebuild | 129 ------
6 files changed, 683 deletions(-)
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
deleted file mode 100644
index 12fa58a..0000000
--- a/media-sound/mumble/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mumble-1.2.4-speech-dispatcher.patch 1289 SHA256
d9443303de024e2efb4c0969121f46b2ebbc45351ab5ab52181ac291aa7a4265 SHA512
32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
WHIRLPOOL
a1696342523dca02ea2c136239e9dbcc6066d4de7cbf195b4a288459b2886e93abb893ff85fad11e4afd21702ad8775002e9487a5068c315fa0b2a0269a07ee5
-AUX mumble-1.2.8-gcc49.patch 722 SHA256
c2aeeb7bfd1b2e2da1a4859f36a078fc89ae29012793ce8a121cf333f420cc88 SHA512
ede8f591291dab6877cd1bbb5fe6b56991df297ae56b2ca1b537abb2b03e15fc273ca26a143a8049c4f7eaba8beab92b23293d1241e015c19b5d03ebc451ec03
WHIRLPOOL
102db5d413d6b031ffe79f3f83fd449c944e64af101fa145efff83cd9501a0e9a82439c08c09c845f1a4657c0543a06c8840dc68f026368ef10d37c44e0ec378
-AUX mumble-jack-support.patch 16257 SHA256
86119fa9e9bbdf3da9aa44c0c99cb2a899d53f07a9e0b27080e24c67402bc143 SHA512
451084ff79b4b19f4895ea357e0da8db65405dd90a6965d7c4d12539b86dd2032de054482a0602a130cc1aa8b7b14b9d78cb466ec2696d085dfbc1a0daa5c825
WHIRLPOOL
127b344667a0ddafc3e234306527cbc6ca7161653f8c380190a0fb68a0fce19ce9303ad77da3442d9e32842dcf6199fc16caae982039a388373f892ec3569609
-DIST mumble-1.2.19.tar.gz 3210865 SHA256
f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 SHA512
f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
WHIRLPOOL
6cf6ab5768946dea78d96dbc7bab0875ecfdee5fb7282f3752a8573f95fabc50c0c38712f79920883b3593ec0be62895c62045ee45b44cb4327a719a98a15990
-EBUILD mumble-1.2.19-r1.ebuild 3211 SHA256
fcc2751b7de2498b2853fc8e2dcb56831da9a2d618cda92319788400c4a3dc59 SHA512
f309f3fdc8e67ef2f5547f8571ffee0d69ad0dae287b2afac02b6c35fbf0cde463aba534e5c73bd8eb7c089ac68240c0e2d78f8e99f34a27ee27f9f2ed208943
WHIRLPOOL
e8677dcf45ae80adb1ba5850dee1c21e6246e02c58839fb3130e33ad3974f0d7cd4b0247efc7c5097aa0a9e8e1483862dc6ed859b9313c9cefd9872b62f8f8f4
-MISC metadata.xml 666 SHA256
6f982f7d4c44637364d2cd80417499b06c40a3f4ef2dd54ed3dcbe97ee04c084 SHA512
c9cd557297af63d195a20c1b913758ea6c4433373f55561b1dc06fc3053a949495e2a19542b43affb0c799e4ff9747410cd0a260568e9365a529aa6943910fb9
WHIRLPOOL
6471d3abcfacfca331f84bbbd423dd6eaa70ed1c41229001d96766176aec79da6aaaf07ff25c63e4264f92b2c022dc9c34c349ab29232eb5ff9457e315afdd8e
diff --git a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
deleted file mode 100644
index 3a2c216..0000000
--- a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <mik...@krautz.dk>
-Date: Thu, 6 Jun 2013 22:17:31 +0200
-Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
-
-Based on initial patch by Timo Gurr <timo.g...@gmail.com>
----
- src/mumble/TextToSpeech_unix.cpp | 6 +++++-
- src/mumble/mumble.pro | 7 ++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/mumble/TextToSpeech_unix.cpp
b/src/mumble/TextToSpeech_unix.cpp
-index d0fbb82..6443c07 100644
---- a/src/mumble/TextToSpeech_unix.cpp
-+++ b/src/mumble/TextToSpeech_unix.cpp
-@@ -33,7 +33,11 @@
- #include "TextToSpeech.h"
-
- #ifdef USE_SPEECHD
--#include <libspeechd.h>
-+# ifdef USE_SPEECHD_PKGCONFIG
-+# include <speech-dispatcher/libspeechd.h>
-+# else
-+# include <libspeechd.h>
-+# endif
- #endif
-
- #include "Global.h"
-diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
-index 04f5a36..ff3c02f 100644
---- a/src/mumble/mumble.pro
-+++ b/src/mumble/mumble.pro
-@@ -279,7 +279,12 @@ dbus {
-
- speechd {
- DEFINES *= USE_SPEECHD
-- LIBS *= -lspeechd
-+ system(pkg-config --atleast-version=0.8 speech-dispatcher) {
-+ DEFINES *= USE_SPEECHD_PKGCONFIG
-+ PKGCONFIG *= speech-dispatcher
-+ } else {
-+ LIBS *= -lspeechd
-+ }
- }
-
- directsound {
---
-1.8.1.6
-
diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
deleted file mode 100644
index cecb3d3..0000000
--- a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/532180
-
-Avoid "jump to label crosses initialization" error.
-
- Move variable "buffer" into the while loop to avoid a compile error
- with g++ 4.9.0.
-
- Although earlier compiler versions did accept the code, jumping into the
- scope of an variable length array is not allowed:
- http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
-
-
---- a/src/mumble/OSS.cpp
-+++ b/src/mumble/OSS.cpp
-@@ -243,9 +243,9 @@ void OSSInput::run() {
- eMicFormat = SampleShort;
- initializeMixer();
-
-- short buffer[iMicLength];
--
- while (bRunning) {
-+ short buffer[iMicLength];
-+
- int len = static_cast<int>(iMicLength * iMicChannels *
sizeof(short));
- ssize_t l = read(fd, buffer, len);
- if (l != len) {
diff --git a/media-sound/mumble/files/mumble-jack-support.patch
b/media-sound/mumble/files/mumble-jack-support.patch
deleted file mode 100644
index 840d924..0000000
--- a/media-sound/mumble/files/mumble-jack-support.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.cpp
mumble-1.2.2/src/mumble/JackAudio.cpp
---- mumble-1.2.2.orig/src/mumble/JackAudio.cpp 1970-01-01 01:00:00.000000000
+0100
-+++ mumble-1.2.2/src/mumble/JackAudio.cpp 2011-01-26 06:02:00.000000000
+0000
-@@ -0,0 +1,314 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pc...@users.sourceforge.net>
-+ Copyright (C) 2011, Filipe Coelho <fal...@gmail.com>
-+
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ - Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ - Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ - Neither the name of the Mumble Developers nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include "JackAudio.h"
-+#include "User.h"
-+#include "Global.h"
-+#include "MainWindow.h"
-+#include "Timer.h"
-+
-+#include <cstring>
-+
-+static JackAudioSystem *jasys = NULL;
-+
-+class JackAudioInputRegistrar : public AudioInputRegistrar {
-+ public:
-+ JackAudioInputRegistrar();
-+ virtual AudioInput *create();
-+ virtual const QList<audioDevice> getDeviceChoices();
-+ virtual void setDeviceChoice(const QVariant &, Settings &);
-+ virtual bool canEcho(const QString &) const;
-+};
-+
-+class JackAudioOutputRegistrar : public AudioOutputRegistrar {
-+ public:
-+ JackAudioOutputRegistrar();
-+ virtual AudioOutput *create();
-+ virtual const QList<audioDevice> getDeviceChoices();
-+ virtual void setDeviceChoice(const QVariant &, Settings &);
-+};
-+
-+class JackAudioInit : public DeferInit {
-+ public:
-+ JackAudioInputRegistrar *airJackAudio;
-+ JackAudioOutputRegistrar *aorJackAudio;
-+ void initialize() {
-+ jasys = new JackAudioSystem();
-+ jasys->init_jack();
-+ jasys->qmWait.lock();
-+ jasys->qwcWait.wait(&jasys->qmWait, 1000);
-+ jasys->qmWait.unlock();
-+ if (jasys->bJackIsGood) {
-+ airJackAudio = new JackAudioInputRegistrar();
-+ aorJackAudio = new JackAudioOutputRegistrar();
-+ } else {
-+ airJackAudio = NULL;
-+ aorJackAudio = NULL;
-+ delete jasys;
-+ jasys = NULL;
-+ }
-+ };
-+ void destroy() {
-+ if (airJackAudio)
-+ delete airJackAudio;
-+ if (aorJackAudio)
-+ delete aorJackAudio;
-+ if (jasys) {
-+ jasys->close_jack();
-+ delete jasys;
-+ jasys = NULL;
-+ }
-+ };
-+};
-+
-+static JackAudioInit jackinit; //unused
-+
-+JackAudioSystem::JackAudioSystem() {
-+ bJackIsGood = false;
-+ iSampleRate = 0;
-+}
-+
-+JackAudioSystem::~JackAudioSystem() {
-+}
-+
-+void JackAudioSystem::init_jack()
-+{
-+ client = jack_client_open("mumble", JackNullOption, 0);
-+
-+ if (client) {
-+ in_port = jack_port_register(client, "input",
JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-+ out_port = jack_port_register(client, "output",
JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-+ jack_set_process_callback(client, process_callback, this);
-+ jack_set_sample_rate_callback(client, srate_callback, this);
-+ jack_on_shutdown(client, shutdown_callback, this);
-+
-+ iSampleRate = jack_get_sample_rate(client);
-+
-+ if (jack_activate(client) || in_port == NULL || out_port ==
NULL) {
-+ client = NULL;
-+ return;
-+ }
-+
-+ int port_flags;
-+ unsigned i = -1;
-+ const char** ports = jack_get_ports(client, 0, 0,
JackPortIsPhysical);
-+
-+ if (ports) {
-+ while (ports[++i])
-+ {
-+ jack_port_t* port = jack_port_by_name(client,
ports[i]);
-+ port_flags = jack_port_flags(port);
-+
-+ if (port_flags &
(JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio"))
{
-+ jack_connect(client, ports[i],
jack_port_name(in_port));
-+ }
-+ if (port_flags & (JackPortIsPhysical|JackPortIsInput)
&& strstr(jack_port_type(port), "audio")) {
-+ jack_connect(client, jack_port_name(out_port),
ports[i]);
-+ }
-+ }
-+ }
-+
-+ jack_free(ports);
-+
-+ // If we made it this far, then everything is okay
-+ qhInput.insert(QString(), tr("Hardware Ports"));
-+ qhOutput.insert(QString(), tr("Hardware Ports"));
-+ bJackIsGood = true;
-+
-+ } else {
-+ bJackIsGood = false;
-+ client = NULL;
-+ }
-+}
-+
-+void JackAudioSystem::close_jack()
-+{
-+ if (client) {
-+ jack_deactivate(client);
-+ jack_client_close(client);
-+ client = NULL;
-+ }
-+}
-+
-+int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+
-+ if (jas && jas->bJackIsGood) {
-+ AudioInputPtr ai = g.ai;
-+ AudioOutputPtr ao = g.ao;
-+ JackAudioInput *jai = (JackAudioInput*)(ai.get());
-+ JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
-+
-+ if (jai && jai->bRunning && jai->iMicChannels > 0 &&
!jai->isFinished()) {
-+ void* input = jack_port_get_buffer(jas->in_port,
nframes);
-+ if ((float*)input != 0)
-+ jai->addMic(input, nframes);
-+ }
-+
-+ if (jao && jao->bRunning && jao->iChannels > 0 &&
!jao->isFinished()) {
-+ jack_default_audio_sample_t* output =
(jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
-+ memset(output, 0,
sizeof(jack_default_audio_sample_t)*nframes); //TEST
-+ jao->mix(output, nframes);
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+ jas->iSampleRate = frames;
-+ return 0;
-+}
-+
-+void JackAudioSystem::shutdown_callback(void *arg)
-+{
-+ JackAudioSystem *jas = (JackAudioSystem*)arg;
-+ jas->bJackIsGood = false;
-+}
-+
-+JackAudioInputRegistrar::JackAudioInputRegistrar() :
AudioInputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioInput *JackAudioInputRegistrar::create() {
-+ return new JackAudioInput();
-+}
-+
-+const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() {
-+ QList<audioDevice> qlReturn;
-+
-+ QStringList qlInputDevs = jasys->qhInput.keys();
-+ qSort(qlInputDevs);
-+
-+ foreach(const QString &dev, qlInputDevs) {
-+ qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
-+ }
-+
-+ return qlReturn;
-+}
-+
-+void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice,
Settings &s) {
-+ Q_UNUSED(choice);
-+ Q_UNUSED(s);
-+}
-+
-+bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
-+ Q_UNUSED(osys);
-+ return false;
-+}
-+
-+JackAudioOutputRegistrar::JackAudioOutputRegistrar() :
AudioOutputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioOutput *JackAudioOutputRegistrar::create() {
-+ return new JackAudioOutput();
-+}
-+
-+const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() {
-+ QList<audioDevice> qlReturn;
-+
-+ QStringList qlOutputDevs = jasys->qhOutput.keys();
-+ qSort(qlOutputDevs);
-+
-+ foreach(const QString &dev, qlOutputDevs) {
-+ qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
-+ }
-+
-+ return qlReturn;
-+}
-+
-+void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice,
Settings &s) {
-+ Q_UNUSED(choice);
-+ Q_UNUSED(s);
-+}
-+
-+JackAudioInput::JackAudioInput() {
-+ bRunning = true;
-+ iMicChannels = 0;
-+};
-+
-+JackAudioInput::~JackAudioInput() {
-+ bRunning = false;
-+ iMicChannels = 0;
-+ qmMutex.lock();
-+ qwcWait.wakeAll();
-+ qmMutex.unlock();
-+ wait();
-+}
-+
-+void JackAudioInput::run() {
-+ if (jasys && jasys->bJackIsGood) {
-+ iMicFreq = jasys->iSampleRate;
-+ iMicChannels = 1;
-+ eMicFormat = SampleFloat;
-+ initializeMixer();
-+ }
-+
-+ qmMutex.lock();
-+ while (bRunning)
-+ qwcWait.wait(&qmMutex);
-+ qmMutex.unlock();
-+}
-+
-+JackAudioOutput::JackAudioOutput() {
-+ bRunning = true;
-+ iChannels = 0;
-+}
-+
-+JackAudioOutput::~JackAudioOutput() {
-+ bRunning = false;
-+ iChannels = 0;
-+ qmMutex.lock();
-+ qwcWait.wakeAll();
-+ qmMutex.unlock();
-+ wait();
-+}
-+
-+void JackAudioOutput::run() {
-+ if (jasys && jasys->bJackIsGood) {
-+ unsigned int chanmasks[32];
-+
-+ chanmasks[0] = SPEAKER_FRONT_LEFT;
-+ chanmasks[1] = SPEAKER_FRONT_RIGHT;
-+
-+ eSampleFormat = SampleFloat;
-+ iMixerFreq = jasys->iSampleRate;
-+ iChannels = 1;
-+ initializeMixer(chanmasks);
-+ }
-+
-+ qmMutex.lock();
-+ while (bRunning)
-+ qwcWait.wait(&qmMutex);
-+ qmMutex.unlock();
-+}
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.h
mumble-1.2.2/src/mumble/JackAudio.h
---- mumble-1.2.2.orig/src/mumble/JackAudio.h 1970-01-01 01:00:00.000000000
+0100
-+++ mumble-1.2.2/src/mumble/JackAudio.h 2011-01-26 06:03:58.000000000
+0000
-@@ -0,0 +1,98 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pc...@users.sourceforge.net>
-+ Copyright (C) 2011, Filipe Coelho <fal...@gmail.com>
-+
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ - Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ - Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ - Neither the name of the Mumble Developers nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifndef _JACKAUDIO_H
-+#define _JACKAUDIO_H
-+
-+#include "AudioInput.h"
-+#include "AudioOutput.h"
-+#include <jack/jack.h>
-+#include <QWaitCondition>
-+
-+class JackAudioOutput;
-+class JackAudioInput;
-+
-+class JackAudioSystem : public QObject {
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioSystem)
-+ protected:
-+ jack_client_t* client;
-+ jack_port_t* in_port;
-+ jack_port_t* out_port;
-+
-+ static int process_callback(jack_nframes_t nframes, void
*arg);
-+ static int srate_callback(jack_nframes_t frames, void *arg);
-+ static void shutdown_callback(void *arg);
-+ public:
-+ QHash<QString, QString> qhInput;
-+ QHash<QString, QString> qhOutput;
-+ bool bJackIsGood;
-+ int iSampleRate;
-+ QMutex qmWait;
-+ QWaitCondition qwcWait;
-+
-+ void init_jack();
-+ void close_jack();
-+
-+ JackAudioSystem();
-+ ~JackAudioSystem();
-+};
-+
-+class JackAudioInput : public AudioInput {
-+ friend class JackAudioSystem;
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioInput)
-+ protected:
-+ QMutex qmMutex;
-+ QWaitCondition qwcWait;
-+ public:
-+ JackAudioInput();
-+ ~JackAudioInput();
-+ void run();
-+};
-+
-+class JackAudioOutput : public AudioOutput {
-+ friend class JackAudioSystem;
-+ private:
-+ Q_OBJECT
-+ Q_DISABLE_COPY(JackAudioOutput)
-+ protected:
-+ QMutex qmMutex;
-+ QWaitCondition qwcWait;
-+ public:
-+ JackAudioOutput();
-+ ~JackAudioOutput();
-+ void run();
-+};
-+
-+#endif
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/mumble.pro
mumble-1.2.2/src/mumble/mumble.pro
---- mumble-1.2.2.orig/src/mumble/mumble.pro 2010-02-09 16:34:51.000000000
+0000
-+++ mumble-1.2.2/src/mumble/mumble.pro 2011-01-26 01:45:55.000000000 +0000
-@@ -93,11 +93,17 @@
- unix {
- HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
- HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors
portaudio-2.0)
-+ HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
-
- !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
- CONFIG *= portaudio
- }
-
-+ !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
-+ CONFIG -= portaudio
-+ CONFIG *= jackaudio
-+ }
-+
- !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
- CONFIG -= portaudio
- CONFIG *= pulseaudio
-@@ -110,6 +116,13 @@
- QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
- }
-
-+ jackaudio {
-+ DEFINES *= USE_JACKAUDIO
-+ PKGCONFIG *= jack
-+ HEADERS *= JackAudio.h
-+ SOURCES *= JackAudio.cpp
-+ }
-+
- CONFIG *= link_pkgconfig
-
- PKGCONFIG *= openssl sndfile
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
deleted file mode 100644
index e455ad4..0000000
--- a/media-sound/mumble/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>polynomia...@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <longdescription lang="en">
-Mumble is an open source, low-latency, high quality voice chat software
primarily intended for use while gaming.
- </longdescription>
- <use>
- <flag name="g15">Enable support for the Logitech G15 LCD (and
compatible devices).</flag>
- <flag name="speech">Enable text-to-speech support in
Mumble.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">mumble</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.2.19-r1.ebuild
b/media-sound/mumble/mumble-1.2.19-r1.ebuild
deleted file mode 100644
index 43d6f63..0000000
--- a/media-sound/mumble/mumble-1.2.19-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib qmake-utils
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat
software"
-HOMEPAGE="https://wiki.mumble.info";
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz";
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+alsa +dbus debug g15 jack libressl oss pch portaudio pulseaudio speech
zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
- !libressl? ( >=dev-libs/openssl-1.0.0b:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/protobuf-2.2.0:=
- >=media-libs/libsndfile-1.0.20[-minimal]
- >=media-libs/opus-1.0.1
- || (
- (
- >=media-libs/speex-1.2.0
- media-libs/speexdsp
- )
- <media-libs/speex-1.2.0
- )
- sys-apps/lsb-release
- x11-libs/libX11
- x11-libs/libXi
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4[sqlite]
- dev-qt/qtsvg:4
- dev-qt/qtxmlpatterns:4
- x11-proto/inputproto
- alsa? ( media-libs/alsa-lib )
- dbus? ( dev-qt/qtdbus:4 )
- g15? ( app-misc/g15daemon )
- jack? ( virtual/jack )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- speech? ( app-accessibility/speech-dispatcher )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
- use jack && epatch "${FILESDIR}"/${PN}-jack-support.patch
- eapply_user
-}
-
-src_configure() {
- local conf_add
-
- if has_version '<=sys-devel/gcc-4.2'; then
- conf_add="${conf_add} no-pch"
- else
- use pch || conf_add="${conf_add} no-pch"
- fi
-
- use alsa || conf_add="${conf_add} no-alsa"
- use dbus || conf_add="${conf_add} no-dbus"
- use debug && conf_add="${conf_add} symbols debug" ||
conf_add="${conf_add} release"
- use g15 || conf_add="${conf_add} no-g15"
- use oss || conf_add="${conf_add} no-oss"
- use portaudio || conf_add="${conf_add} no-portaudio"
- use pulseaudio || conf_add="${conf_add} no-pulseaudio"
- use speech || conf_add="${conf_add} no-speechd"
- use zeroconf || conf_add="${conf_add} no-bonjour"
-
- eqmake4 "${S}/main.pro" -recursive \
- CONFIG+="${conf_add} \
- bundled-celt \
- no-bundled-opus \
- no-bundled-speex \
- no-embed-qt-translations \
- no-server \
- no-update" \
- DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
- newdoc README.Linux README
- dodoc CHANGES
-
- local dir
- if use debug; then
- dir=debug
- else
- dir=release
- fi
-
- dobin "${dir}"/mumble
- dobin scripts/mumble-overlay
-
- insinto /usr/share/services
- doins scripts/mumble.protocol
-
- domenu scripts/mumble.desktop
-
- insinto /usr/share/icons/hicolor/scalable/apps
- doins icons/mumble.svg
-
- doman man/mumble-overlay.1
- doman man/mumble.1
-
- insopts -o root -g root -m 0755
- insinto "/usr/$(get_libdir)/mumble"
- doins "${dir}"/libmumble.so.${PV}
- dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
- doins "${dir}"/libcelt0.so.0.{7,11}.0
- doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
- echo
- elog "Visit http://mumble.sourceforge.net/ for futher configuration
instructions."
- elog "Run mumble-overlay to start the OpenGL overlay (after starting
mumble)."
- echo
-}
