mumble: fix OpenGL overlay and TTS (#5739)
Add patches to link the OpenGl overlay against LibGL to fix its functionality and properly include the speech-dispatcher headers so mumble can be built with text-to-speech functionality enabled. Also install the mumble-overlay script to make it easier to actually use the overlay.
This commit is contained in:
parent
212ce8f60e
commit
2474f13f5a
srcpkgs/mumble
11
srcpkgs/mumble/patches/link-overlay-against-libGL.patch
Normal file
11
srcpkgs/mumble/patches/link-overlay-against-libGL.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- overlay_gl/overlay_gl.pro 2017-01-29 23:44:01.966483578 +0100
|
||||
+++ overlay_gl/overlay_gl.pro 2017-01-29 23:44:24.487186063 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
TARGET = mumble$(TARGET_ADD)
|
||||
VERSION = 1.2.19
|
||||
SOURCES = overlay.c
|
||||
-LIBS *= -lrt -ldl
|
||||
+LIBS *= -lGL -lrt -ldl
|
||||
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
|
||||
QMAKE_LFLAGS -= -Wl,--no-undefined
|
||||
QMAKE_LFLAGS *= $(LFLAGS_ADD)
|
11
srcpkgs/mumble/patches/speech-dispatcher.patch
Normal file
11
srcpkgs/mumble/patches/speech-dispatcher.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/mumble/TextToSpeech_unix.cpp.orig 2017-02-14 16:33:58.775742063 +0100
|
||||
+++ src/mumble/TextToSpeech_unix.cpp 2017-02-14 16:34:22.172484062 +0100
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "TextToSpeech.h"
|
||||
|
||||
#ifdef USE_SPEECHD
|
||||
-#include <libspeechd.h>
|
||||
+#include <speech-dispatcher/libspeechd.h>
|
||||
#endif
|
||||
|
||||
#include "Global.h"
|
@ -1,12 +1,13 @@
|
||||
# Template file for 'mumble'
|
||||
pkgname=mumble
|
||||
version=1.2.19
|
||||
revision=1
|
||||
revision=2
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="
|
||||
libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel
|
||||
speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
|
||||
avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel"
|
||||
avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel
|
||||
speech-dispatcher-devel"
|
||||
depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
|
||||
short_desc="Open source, low-latency, high quality voice chat for gaming"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
@ -18,8 +19,8 @@ checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8
|
||||
do_configure() {
|
||||
# Needs bundled celt for some reason
|
||||
qmake -recursive main.pro \
|
||||
CONFIG+="bundled-celt no-bundled-opus no-speechd no-bundled-speex no-g15 \
|
||||
no-xevie pulseaudio no-embed-qt-translations no-update-packaged" \
|
||||
CONFIG+="bundled-celt no-bundled-opus no-update no-bundled-speex no-g15 \
|
||||
no-xevie pulseaudio no-embed-qt-translations" \
|
||||
DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"
|
||||
# qmake-qt4 ignores CXXFLAGS and LDFLAGS thus patch the Makefiles
|
||||
sed -i */Makefile* */*/Makefile* \
|
||||
@ -36,6 +37,7 @@ do_install() {
|
||||
vmkdir usr/share/icons/hicolor/scalable/apps
|
||||
|
||||
vbin ${wrksrc}/release/murmurd
|
||||
vbin ${wrksrc}/scripts/mumble-overlay
|
||||
vman ${wrksrc}/man/murmurd.1
|
||||
vman ${wrksrc}/man/murmur-user-wrapper.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user