diff options
Diffstat (limited to 'audio/mumble')
-rw-r--r-- | audio/mumble/Makefile | 93 | ||||
-rw-r--r-- | audio/mumble/distinfo | 7 | ||||
-rw-r--r-- | audio/mumble/files/extrapatch-fix-build-boost-1.66 | 26 | ||||
-rw-r--r-- | audio/mumble/files/patch-compiler.pri | 15 | ||||
-rw-r--r-- | audio/mumble/files/patch-cplusplus.pri | 13 | ||||
-rw-r--r-- | audio/mumble/files/patch-overlay_gl-overlay.c | 10 | ||||
-rw-r--r-- | audio/mumble/files/patch-overlay_overlay.h | 28 | ||||
-rw-r--r-- | audio/mumble/files/patch-plugins-plugins.pri | 27 | ||||
-rw-r--r-- | audio/mumble/files/patch-src-Net.cpp | 15 | ||||
-rw-r--r-- | audio/mumble/files/patch-src-mumble-CELTCodec.cpp | 10 | ||||
-rw-r--r-- | audio/mumble/files/patch-src-mumble-ServerHandler.cpp | 15 | ||||
-rw-r--r-- | audio/mumble/files/patch-src-mumble-mumble.pro | 20 | ||||
-rw-r--r-- | audio/mumble/files/patch-src-mumble-mumble_pch.hpp | 11 | ||||
-rw-r--r-- | audio/mumble/files/patch-src__mumble__OSS.cpp | 65 | ||||
-rw-r--r-- | audio/mumble/pkg-descr | 4 | ||||
-rw-r--r-- | audio/mumble/pkg-plist | 13 |
16 files changed, 0 insertions, 372 deletions
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile deleted file mode 100644 index 6782ad4d22ad..000000000000 --- a/audio/mumble/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# Created by: marius nuennerich -# $FreeBSD$ - -PORTNAME= mumble -PORTVERSION= 1.2.19 -PORTREVISION= 14 -CATEGORIES= audio - -MAINTAINER= feld@FreeBSD.org -COMMENT= Voice chat software primarily intended for use while gaming - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -LIB_DEPENDS+= libspeex.so:audio/speex \ - libspeexdsp.so:audio/speexdsp \ - libsndfile.so:audio/libsndfile \ - libboost_iostreams.so:devel/boost-libs \ - libprotoc.so:devel/protobuf \ - libopus.so:audio/opus - -PLIST_SUB+= PORTVERSION="${PORTVERSION}" - -USES= compiler:c++11-lang cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl -USE_CXXSTD= c++11 -USE_GITHUB= yes -GH_ACCOUNT= mumble-voip -GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11 -GH_TAGNAME= 5a16cda:mumble_celt_0_7 e18de77:mumble_celt_0_11 -GH_SUBDIR= celt-0.7.0-src:mumble_celt_0_7 celt-0.11.0-src:mumble_celt_0_11 -USE_QT= gui svg iconengines_run xml sql network l10n \ - linguist_build moc_build rcc_build uic_build \ - opengl sql-sqlite3_run corelib -USE_LDCONFIG= yes - -USE_XORG= ice xi x11 -INSTALLS_ICONS= yes -MAKE_JOBS_UNSAFE=yes - -CONFIG= no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \ - bundled-celt no-g15 no-pulseaudio no-xevie no-embed-qt-translations - -EXTRA_PATCHES= ${FILESDIR}/extrapatch-fix-build-boost-1.66:-p1 - -QMAKE_ARGS= "CONFIG+=${CONFIG}" - -OPTIONS_DEFINE= DBUS BONJOUR PORTAUDIO -OPTIONS_DEFAULT= DBUS - -DBUS_VARS_OFF= CONFIG+=no-dbus -DBUS_USES= qt:4 -DBUS_USE= QT=dbus - -BONJOUR_DESC= Bonjour support -BONJOUR_VARS_OFF= CONFIG+=no-bonjour -BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder - -PORTAUDIO_VARS_OFF= CONFIG+=no-portaudio -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio - -.include <bsd.port.pre.mk> - -# PCH is broken on GCC -.if ${CHOSEN_COMPILER_TYPE} == gcc -CONFIG+= no-pch -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro - @${RM} ${WRKSRC}/plugins/manual/.qmake.cache - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0 - ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0 - ${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2 - ${MKDIR} ${STAGEDIR}${PREFIX}/share/services - ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services - ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps - ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps - @${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mumble.1 - -.include <bsd.port.post.mk> diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo deleted file mode 100644 index 98baeb808853..000000000000 --- a/audio/mumble/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1496976137 -SHA256 (mumble-voip-mumble-1.2.19_GH0.tar.gz) = 7835e9cec78184cd73f091448e14daa451cd206431775b6babad70bc81b6fd50 -SIZE (mumble-voip-mumble-1.2.19_GH0.tar.gz) = 3324626 -SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a -SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631 -SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a -SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833 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() { diff --git a/audio/mumble/pkg-descr b/audio/mumble/pkg-descr deleted file mode 100644 index 5855658b0ca2..000000000000 --- a/audio/mumble/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Mumble is an open source, low-latency, high quality voice chat software -primarily intended for use while gaming. - -WWW: http://mumble.sourceforge.net/ diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist deleted file mode 100644 index f09c53bc3c43..000000000000 --- a/audio/mumble/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -bin/mumble -lib/libcelt-mumble.so.0.11.0 -lib/libcelt-mumble.so.0.7.0 -lib/libmumble.so -lib/libmumble.so.1 -lib/libmumble.so.1.2 -lib/libmumble.so.%%PORTVERSION%% -man/man1/mumble.1.gz -share/applications/mumble.desktop -share/icons/hicolor/128x128/apps/mumble.png -share/icons/hicolor/scalable/apps/mumble.svg -share/pixmaps/mumble.xpm -share/services/mumble.protocol |