summaryrefslogtreecommitdiff
path: root/audio/mumble/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mumble/files')
-rw-r--r--audio/mumble/files/extrapatch-fix-build-boost-1.6626
-rw-r--r--audio/mumble/files/patch-compiler.pri15
-rw-r--r--audio/mumble/files/patch-cplusplus.pri13
-rw-r--r--audio/mumble/files/patch-overlay_gl-overlay.c10
-rw-r--r--audio/mumble/files/patch-overlay_overlay.h28
-rw-r--r--audio/mumble/files/patch-plugins-plugins.pri27
-rw-r--r--audio/mumble/files/patch-src-Net.cpp15
-rw-r--r--audio/mumble/files/patch-src-mumble-CELTCodec.cpp10
-rw-r--r--audio/mumble/files/patch-src-mumble-ServerHandler.cpp15
-rw-r--r--audio/mumble/files/patch-src-mumble-mumble.pro20
-rw-r--r--audio/mumble/files/patch-src-mumble-mumble_pch.hpp11
-rw-r--r--audio/mumble/files/patch-src__mumble__OSS.cpp65
12 files changed, 0 insertions, 255 deletions
diff --git a/audio/mumble/files/extrapatch-fix-build-boost-1.66 b/audio/mumble/files/extrapatch-fix-build-boost-1.66
deleted file mode 100644
index 2efbfc26df7d..000000000000
--- a/audio/mumble/files/extrapatch-fix-build-boost-1.66
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
-index cbe0c0e2b..7a0a5e2ab 100644
---- a/src/mumble/AudioOutput.cpp
-+++ b/src/mumble/AudioOutput.cpp
-@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) {
- top[2] = 0.0f;
- }
-
-- if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-+ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
- // Not perpendicular. Assume Y up and rotate 90 degrees.
-
- float azimuth = 0.0f;
-diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp
-index ba87eab3b..dac5ba629 100644
---- a/src/mumble/mumble_pch.hpp
-+++ b/src/mumble/mumble_pch.hpp
-@@ -37,6 +37,8 @@
- #include <QtSql/QtSql>
- #include <QtXml/QtXml>
-
-+#include <cmath>
-+
- #ifdef Q_OS_WIN
- #include <windows.h>
- #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
diff --git a/audio/mumble/files/patch-compiler.pri b/audio/mumble/files/patch-compiler.pri
deleted file mode 100644
index 6466fc46acf4..000000000000
--- a/audio/mumble/files/patch-compiler.pri
+++ /dev/null
@@ -1,15 +0,0 @@
---- compiler.pri.orig 2014-08-08 15:51:59 UTC
-+++ compiler.pri
-@@ -109,9 +109,9 @@ unix {
-
- unix:!macx {
- CONFIG(debug, debug|release) {
-- QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
-- QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
-- QMAKE_LFLAGS = -Wl,--no-add-needed
-+ QMAKE_CFLAGS *= -fPIE -pie
-+ QMAKE_CXXFLAGS *= -fPIE -pie
-+ QMAKE_LFLAGS = -Wl
- }
-
- DEFINES *= _FORTIFY_SOURCE=2
diff --git a/audio/mumble/files/patch-cplusplus.pri b/audio/mumble/files/patch-cplusplus.pri
deleted file mode 100644
index bceb2dc3576a..000000000000
--- a/audio/mumble/files/patch-cplusplus.pri
+++ /dev/null
@@ -1,13 +0,0 @@
---- cplusplus.pri.orig 2017-01-27 12:29:08 UTC
-+++ cplusplus.pri
-@@ -103,8 +103,8 @@ unix {
- # older compilers. In GCC, the following
- # flags mean the same thing:
- # -std=c++98, -std=c++03, -ansi.
-- QMAKE_CXXFLAGS += -std=c++98
-- QMAKE_LFLAGS += -std=c++98
-+ # QMAKE_CXXFLAGS += -std=c++98
-+ # QMAKE_LFLAGS += -std=c++98
- }
-
-
diff --git a/audio/mumble/files/patch-overlay_gl-overlay.c b/audio/mumble/files/patch-overlay_gl-overlay.c
deleted file mode 100644
index b7c34e68d84f..000000000000
--- a/audio/mumble/files/patch-overlay_gl-overlay.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
diff --git a/audio/mumble/files/patch-overlay_overlay.h b/audio/mumble/files/patch-overlay_overlay.h
deleted file mode 100644
index b94a68923dd5..000000000000
--- a/audio/mumble/files/patch-overlay_overlay.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index 9c8cebe61052..000000000000
--- a/audio/mumble/files/patch-plugins-plugins.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-Disable debug; runs into cryptic errors on 9+/amd64
-
---- plugins/plugins.pri.orig 2014-08-08 15:51:59 UTC
-+++ plugins/plugins.pri
-@@ -1,7 +1,7 @@
- include(../compiler.pri)
-
- TEMPLATE = lib
--CONFIG += plugin debug_and_release warn_on
-+CONFIG += plugin warn_on
- CONFIG -= qt
- DIST *= mumble_plugin.h
-
-@@ -10,12 +10,7 @@ CONFIG(static) {
- CONFIG += qt_dynamic_lookup
- }
-
--CONFIG(debug, debug|release) {
-- CONFIG += console
-- DESTDIR = ../../debug/plugins
--}
--
--CONFIG(release, debug|release) {
-+CONFIG(release, release) {
- DESTDIR = ../../release/plugins
- }
-
diff --git a/audio/mumble/files/patch-src-Net.cpp b/audio/mumble/files/patch-src-Net.cpp
deleted file mode 100644
index f8bb61dd1384..000000000000
--- a/audio/mumble/files/patch-src-Net.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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__
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <netinet/tcp.h>
-+#endif
-
- HostAddress::HostAddress() {
- addr[0] = addr[1] = 0ULL;
diff --git a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
deleted file mode 100644
index fdcdb3324ae8..000000000000
--- a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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);
-+ alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(version);
- #else
- int cpuinfo[4];
- __cpuid(cpuinfo, 1);
diff --git a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
deleted file mode 100644
index 321b28b9b706..000000000000
--- a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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__
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <netinet/tcp.h>
-+#endif
-
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
- qbaMsg = msg;
diff --git a/audio/mumble/files/patch-src-mumble-mumble.pro b/audio/mumble/files/patch-src-mumble-mumble.pro
deleted file mode 100644
index cb36a8f10f13..000000000000
--- a/audio/mumble/files/patch-src-mumble-mumble.pro
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/mumble/mumble.pro.orig 2014-08-08 15:51:59 UTC
-+++ src/mumble/mumble.pro
-@@ -161,7 +161,16 @@ unix {
-
- CONFIG *= link_pkgconfig
-
-- PKGCONFIG *= openssl sndfile
-+ PKGCONFIG *= sndfile
-+
-+ contains(UNAME, FreeBSD) {
-+ CONFIG *= oss
-+ HEADERS *= GlobalShortcut_unix.h
-+ SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
-+ LIBS *= -lssl
-+ } else {
-+ PKGCONFIG *= openssl
-+ }
-
- macx {
- TARGET = Mumble
diff --git a/audio/mumble/files/patch-src-mumble-mumble_pch.hpp b/audio/mumble/files/patch-src-mumble-mumble_pch.hpp
deleted file mode 100644
index 64ac8569a903..000000000000
--- a/audio/mumble/files/patch-src-mumble-mumble_pch.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mumble/mumble_pch.hpp.orig 2016-12-12 20:12:12 UTC
-+++ src/mumble/mumble_pch.hpp
-@@ -42,7 +42,7 @@
- #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
- #endif
-
--#define __int64_t __int64
-+#include <sys/types.h>
- #include <sndfile.h>
- #undef __int64_t
- #include <celt.h>
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 10ee5d91d003..000000000000
--- a/audio/mumble/files/patch-src__mumble__OSS.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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");
-- goto out;
-+ close(fd);
-+ return;
- }
-
- ival = 1;
- if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) {
- qWarning("OSSInput: Failed to set mono mode");
-- goto out;
-+ close(fd);
-+ return;
- }
- iMicChannels = ival;
-
- ival = SAMPLE_RATE;
- if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) {
- qWarning("OSSInput: Failed to set speed");
-- goto out;
-+ close(fd);
-+ return;
- }
- iMicFreq = ival;
-
-@@ -258,8 +259,6 @@ void OSSInput::run() {
- qWarning("OSSInput: Releasing.");
- ioctl(fd, SNDCTL_DSP_RESET, NULL);
-
--out:
-- close(fd);
- }
-
- OSSOutput::OSSOutput() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 15:31:58 +0000