aboutsummaryrefslogtreecommitdiff
path: root/audio/mumble
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mumble')
-rw-r--r--audio/mumble/files/patch-compiler.pri6
-rw-r--r--audio/mumble/files/patch-overlay-overlay.h29
-rw-r--r--audio/mumble/files/patch-overlay_gl-overlay.c6
-rw-r--r--audio/mumble/files/patch-overlay_overlay.h28
-rw-r--r--audio/mumble/files/patch-plugins-plugins.pri6
-rw-r--r--audio/mumble/files/patch-src-Net.cpp8
-rw-r--r--audio/mumble/files/patch-src-mumble-CELTCodec.cpp7
-rw-r--r--audio/mumble/files/patch-src-mumble-OSS.cpp30
-rw-r--r--audio/mumble/files/patch-src-mumble-ServerHandler.cpp8
-rw-r--r--audio/mumble/files/patch-src-mumble-mumble.pro6
-rw-r--r--audio/mumble/files/patch-src__mumble__OSS.cpp35
11 files changed, 82 insertions, 87 deletions
diff --git a/audio/mumble/files/patch-compiler.pri b/audio/mumble/files/patch-compiler.pri
index c6fc59df69af..6466fc46acf4 100644
--- a/audio/mumble/files/patch-compiler.pri
+++ b/audio/mumble/files/patch-compiler.pri
@@ -1,6 +1,6 @@
---- compiler.pri.orig 2011-02-24 16:24:49.000000000 -0500
-+++ compiler.pri 2011-02-24 16:26:09.000000000 -0500
-@@ -103,9 +103,9 @@
+--- compiler.pri.orig 2014-08-08 15:51:59 UTC
++++ compiler.pri
+@@ -109,9 +109,9 @@ unix {
unix:!macx {
CONFIG(debug, debug|release) {
diff --git a/audio/mumble/files/patch-overlay-overlay.h b/audio/mumble/files/patch-overlay-overlay.h
deleted file mode 100644
index a7f88f164294..000000000000
--- a/audio/mumble/files/patch-overlay-overlay.h
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -r -C 2 mumble-1.1.8/overlay/overlay.h overlay/overlay.h
-*** mumble-1.1.8/overlay/overlay.h 2009-03-22 16:05:00.000000000 +0100
---- overlay/overlay.h 2009-08-06 20:07:48.000000000 +0200
-***************
-*** 43,46 ****
---- 43,65 ----
- #define OVERLAY_VERSION_SUB 0
-
-+ /* BSD support */
-+ #ifndef ElfW
-+ # ifdef __FreeBSD__
-+ # if __ELF_WORD_SIZE == 32
-+ # define ElfW(type) Elf32_##type
-+ # else
-+ # define ElfW(type) Elf64_##type
-+ # endif
-+ # else
-+ # ifdef __NetBSD__
-+ # if ELFSIZE == 32
-+ # define ElfW(type) Elf32_##type
-+ # else
-+ # define ElfW(type) Elf64_##type
-+ # endif
-+ # endif
-+ # endif
-+ #endif
-+
- struct TextEntry {
- unsigned int color;
diff --git a/audio/mumble/files/patch-overlay_gl-overlay.c b/audio/mumble/files/patch-overlay_gl-overlay.c
index 3323640e6630..b7c34e68d84f 100644
--- a/audio/mumble/files/patch-overlay_gl-overlay.c
+++ b/audio/mumble/files/patch-overlay_gl-overlay.c
@@ -1,10 +1,10 @@
---- overlay_gl/overlay.c~ 2011-02-19 16:35:15.000000000 -0500
-+++ overlay_gl/overlay.c 2011-02-27 16:04:32.000000000 -0500
+--- overlay_gl/overlay.c.orig 2014-08-08 15:51:59 UTC
++++ overlay_gl/overlay.c
@@ -45,6 +45,7 @@
#include <sys/ipc.h>
#include <sys/time.h>
#include <sys/socket.h>
+#include <sys/stat.h>
#include <sys/un.h>
+ #include <sys/stat.h>
#include <time.h>
- #include <semaphore.h>
diff --git a/audio/mumble/files/patch-overlay_overlay.h b/audio/mumble/files/patch-overlay_overlay.h
new file mode 100644
index 000000000000..b94a68923dd5
--- /dev/null
+++ b/audio/mumble/files/patch-overlay_overlay.h
@@ -0,0 +1,28 @@
+--- overlay/overlay.h.orig 2014-08-08 15:51:59 UTC
++++ overlay/overlay.h
+@@ -42,6 +42,25 @@ struct OverlayMsgHeader {
+ #define OVERLAY_MSGTYPE_INIT 0
+ struct OverlayMsgInit {
+ unsigned int uiWidth;
++/* BSD support */
++#ifndef ElfW
++# ifdef __FreeBSD__
++# if __ELF_WORD_SIZE == 32
++# define ElfW(type) Elf32_##type
++# else
++# define ElfW(type) Elf64_##type
++# endif
++# else
++# ifdef __NetBSD__
++# if ELFSIZE == 32
++# define ElfW(type) Elf32_##type
++# else
++# define ElfW(type) Elf64_##type
++# endif
++# endif
++# endif
++#endif
++
+ unsigned int uiHeight;
+ };
+
diff --git a/audio/mumble/files/patch-plugins-plugins.pri b/audio/mumble/files/patch-plugins-plugins.pri
index 5915cb684865..9c8cebe61052 100644
--- a/audio/mumble/files/patch-plugins-plugins.pri
+++ b/audio/mumble/files/patch-plugins-plugins.pri
@@ -1,7 +1,7 @@
Disable debug; runs into cryptic errors on 9+/amd64
---- plugins/plugins.pri.orig 2013-06-04 10:06:48.955586932 -0500
-+++ plugins/plugins.pri 2013-06-04 10:07:37.450613576 -0500
+--- plugins/plugins.pri.orig 2014-08-08 15:51:59 UTC
++++ plugins/plugins.pri
@@ -1,7 +1,7 @@
include(../compiler.pri)
@@ -11,7 +11,7 @@ Disable debug; runs into cryptic errors on 9+/amd64
CONFIG -= qt
DIST *= mumble_plugin.h
-@@ -10,12 +10,7 @@
+@@ -10,12 +10,7 @@ CONFIG(static) {
CONFIG += qt_dynamic_lookup
}
diff --git a/audio/mumble/files/patch-src-Net.cpp b/audio/mumble/files/patch-src-Net.cpp
index 5904139aaf3c..f8bb61dd1384 100644
--- a/audio/mumble/files/patch-src-Net.cpp
+++ b/audio/mumble/files/patch-src-Net.cpp
@@ -1,7 +1,7 @@
---- src/Net.cpp.orig 2010-01-08 00:37:46.000000000 +0200
-+++ src/Net.cpp 2010-01-10 23:55:48.000000000 +0200
-@@ -29,6 +29,12 @@
- */
+--- src/Net.cpp.orig 2014-08-08 15:51:59 UTC
++++ src/Net.cpp
+@@ -31,6 +31,12 @@
+ #include "murmur_pch.h"
#include "Net.h"
+#ifdef __FreeBSD__
diff --git a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
index b8d3d2f3a0eb..fdcdb3324ae8 100644
--- a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
+++ b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
@@ -1,6 +1,6 @@
---- src/mumble/CELTCodec.cpp.orig 2013-08-07 07:26:41.259860710 +0200
-+++ src/mumble/CELTCodec.cpp 2013-08-07 07:27:58.905421337 +0200
-@@ -64,6 +64,7 @@
+--- src/mumble/CELTCodec.cpp.orig 2014-08-08 15:51:59 UTC
++++ src/mumble/CELTCodec.cpp
+@@ -64,6 +64,7 @@ CELTCodec::CELTCodec(const QString &vers
alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version);
alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
alternatives << QString::fromLatin1("celt.so.%1").arg(version);
@@ -8,4 +8,3 @@
#else
int cpuinfo[4];
__cpuid(cpuinfo, 1);
-
diff --git a/audio/mumble/files/patch-src-mumble-OSS.cpp b/audio/mumble/files/patch-src-mumble-OSS.cpp
deleted file mode 100644
index 596269e4681f..000000000000
--- a/audio/mumble/files/patch-src-mumble-OSS.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/mumble/OSS.cpp.orig 2013-08-03 14:01:25.000000000 +0200
-+++ src/mumble/OSS.cpp 2013-08-03 14:12:51.000000000 +0200
-@@ -153,7 +153,6 @@
- qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
- qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
-
--#if (SOUND_VERSION >= 0x040002)
- int mixerfd = open("/dev/mixer", O_RDWR, 0);
- if (mixerfd == -1) {
- qWarning("OSSEnumerator: Failed to open /dev/mixer");
-@@ -182,15 +181,14 @@
- if (ainfo.caps & PCM_CAP_HIDDEN)
- continue;
-
-- qhDevices.insert(handle, device);
-+ qhDevices.insert(name, device);
-
- if (ainfo.caps & PCM_CAP_INPUT)
-- qhInput.insert(handle, name);
-+ qhInput.insert(name, name);
- if (ainfo.caps & PCM_CAP_OUTPUT)
-- qhOutput.insert(handle, name);
-+ qhOutput.insert(name, name);
- }
- close(mixerfd);
--#endif
- }
-
- OSSInput::OSSInput() {
-
diff --git a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
index 6f00c7a48327..321b28b9b706 100644
--- a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
+++ b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
@@ -1,7 +1,7 @@
---- src/mumble/ServerHandler.cpp.orig 2013-06-04 11:44:15.381594007 -0500
-+++ src/mumble/ServerHandler.cpp 2013-06-04 11:44:36.772583833 -0500
-@@ -45,6 +45,12 @@
- #include "PacketDataStream.h"
+--- src/mumble/ServerHandler.cpp.orig 2014-08-08 15:51:59 UTC
++++ src/mumble/ServerHandler.cpp
+@@ -46,6 +46,12 @@
+ #include "RichTextEditor.h"
#include "SSL.h"
#include "User.h"
+#ifdef __FreeBSD__
diff --git a/audio/mumble/files/patch-src-mumble-mumble.pro b/audio/mumble/files/patch-src-mumble-mumble.pro
index 12517ae6f1a2..cb36a8f10f13 100644
--- a/audio/mumble/files/patch-src-mumble-mumble.pro
+++ b/audio/mumble/files/patch-src-mumble-mumble.pro
@@ -1,6 +1,6 @@
---- src/mumble/mumble.pro.orig 2013-06-04 11:46:38.900573055 -0500
-+++ src/mumble/mumble.pro 2013-06-04 11:47:41.836576507 -0500
-@@ -161,7 +161,16 @@
+--- src/mumble/mumble.pro.orig 2014-08-08 15:51:59 UTC
++++ src/mumble/mumble.pro
+@@ -161,7 +161,16 @@ unix {
CONFIG *= link_pkgconfig
diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp
index 123d3c38dd82..10ee5d91d003 100644
--- a/audio/mumble/files/patch-src__mumble__OSS.cpp
+++ b/audio/mumble/files/patch-src__mumble__OSS.cpp
@@ -1,6 +1,33 @@
---- ./src/mumble/OSS.cpp.orig 2013-06-01 21:16:31.000000000 +0000
-+++ ./src/mumble/OSS.cpp 2013-10-12 02:38:45.443221514 +0000
-@@ -221,20 +221,23 @@
+--- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC
++++ src/mumble/OSS.cpp
+@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() {
+ qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
+ qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
+
+-#if (SOUND_VERSION >= 0x040002)
+ int mixerfd = open("/dev/mixer", O_RDWR, 0);
+ if (mixerfd == -1) {
+ qWarning("OSSEnumerator: Failed to open /dev/mixer");
+@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() {
+ if (ainfo.caps & PCM_CAP_HIDDEN)
+ continue;
+
+- qhDevices.insert(handle, device);
++ qhDevices.insert(name, device);
+
+ if (ainfo.caps & PCM_CAP_INPUT)
+- qhInput.insert(handle, name);
++ qhInput.insert(name, name);
+ if (ainfo.caps & PCM_CAP_OUTPUT)
+- qhOutput.insert(handle, name);
++ qhOutput.insert(name, name);
+ }
+ close(mixerfd);
+-#endif
+ }
+
+ OSSInput::OSSInput() {
+@@ -221,20 +219,23 @@ void OSSInput::run() {
ival = AFMT_S16_NE;
if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) {
qWarning("OSSInput: Failed to set sound format");
@@ -27,7 +54,7 @@
}
iMicFreq = ival;
-@@ -258,8 +261,6 @@
+@@ -258,8 +259,6 @@ void OSSInput::run() {
qWarning("OSSInput: Releasing.");
ioctl(fd, SNDCTL_DSP_RESET, NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 08:57:03 +0000