From 5f589a9962d7871deedbaa3d3e92751ace5ef1d6 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 20 Jan 2022 17:21:20 +0100 Subject: [PATCH] mumble: update to 1.4.230. --- .../patches/link-overlay-against-libGL.patch | 19 ++++--- srcpkgs/mumble/patches/musl-basename.patch | 21 ++++++++ srcpkgs/mumble/template | 51 +++++++------------ 3 files changed, 48 insertions(+), 43 deletions(-) create mode 100644 srcpkgs/mumble/patches/musl-basename.patch diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch index cfeaf9bf8c5..f301052bc05 100644 --- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch +++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch @@ -1,11 +1,10 @@ ---- a/overlay_gl/overlay_gl.pro -+++ b/overlay_gl/overlay_gl.pro -@@ -22,7 +22,7 @@ unix:!macx { +--- a/overlay_gl/CMakeLists.txt 2022-01-19 19:46:15.403548981 +0100 ++++ b/overlay_gl/CMakeLists.txt 2022-01-19 19:46:42.463512976 +0100 +@@ -81,6 +81,7 @@ + PRIVATE + "-ldl" + "-lrt" ++ "-lGL" + ) - DEFINES += TARGET_UNIX - linux* { -- LIBS *= -lrt -ldl -+ LIBS *= -lGL -lrt -ldl - } - QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) - QMAKE_LFLAGS -= -Wl,--no-undefined + if(TARGET overlay_gl_x86) diff --git a/srcpkgs/mumble/patches/musl-basename.patch b/srcpkgs/mumble/patches/musl-basename.patch new file mode 100644 index 00000000000..518910ee75f --- /dev/null +++ b/srcpkgs/mumble/patches/musl-basename.patch @@ -0,0 +1,21 @@ +--- a/plugins/HostLinux.cpp 2022-01-19 20:11:28.265212833 +0100 ++++ b/plugins/HostLinux.cpp 2022-01-19 20:12:07.593145226 +0100 +@@ -11,6 +11,7 @@ + #include + + #include ++#include + + HostLinux::HostLinux(const procid_t pid) : m_pid(pid) { + } + +--- a/plugins/mumble_positional_audio_linux.h 2022-01-19 20:22:23.490919031 +0100 ++++ b/plugins/mumble_positional_audio_linux.h 2022-01-19 20:22:39.579923456 +0100 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + // This function returns: + // -1 in case of failure. diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 69a5cb3c796..9dc76808916 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,62 +1,47 @@ # Template file for 'mumble' pkgname=mumble -version=1.3.4 -revision=7 -build_style=qmake -configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update - CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio - $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations - CONFIG+=no-oss $(vopt_if portaudio CONFIG+=portaudio) - DEFINES+=PLUGIN_PATH=/usr/lib/mumble" +version=1.4.230 +revision=1 +wrksrc=mumble-${version}.src +build_style=cmake +make_cmd=make +configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF + -Dbundled-speex=OFF -Djackaudio=$(vopt_if jack ON OFF) -Dportaudio=$(vopt_if portaudio ON OFF) + -Dupdate=OFF -Dbundle-qt-translations=OFF -Dwarnings-as-errors=OFF" hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which" makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel - libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel + libcap-devel openssl-devel libsndfile-devel protobuf-devel opus-devel pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel - speech-dispatcher-devel speex-devel $(vopt_if portaudio portaudio-devel)" + speech-dispatcher-devel speex-devel $(vopt_if portaudio portaudio-devel) + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite + qt5-plugin-tds poco-devel qt5-tools-devel" depends="desktop-file-utils qt5-plugin-sqlite" short_desc="Open source, low-latency, high quality voice chat for gaming" maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="http://mumble.sourceforge.net/" -distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093 +distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0 build_options="jack portaudio" build_options_default="jack portaudio" -do_install() { - vlicense LICENSE - vmkdir usr/lib/mumble - vmkdir usr/share/applications - vmkdir usr/share/icons/hicolor/scalable/apps +export CMAKE_GENERATOR="Unix Makefiles" - vbin ${wrksrc}/release/murmurd +post_install() { vbin ${wrksrc}/scripts/murmur-user-wrapper - vbin ${wrksrc}/scripts/mumble-overlay - vman ${wrksrc}/man/murmurd.1 - vman ${wrksrc}/man/murmur-user-wrapper.1 - - vbin ${wrksrc}/release/mumble - vman ${wrksrc}/man/mumble.1 - cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble - cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble - - cp ${wrksrc}/scripts/mumble.desktop ${DESTDIR}/usr/share/applications - cp ${wrksrc}/icons/mumble.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps - vsconf scripts/murmur.ini - vsconf scripts/murmur.ini.system + vlicense LICENSE } murmur_package() { depends="mumble-${version}_${revision}" short_desc+=" - The murmur server (for mumble)" pkg_install() { - vmove usr/bin/murmurd + vmove usr/bin/mumble-server vmove usr/bin/murmur-user-wrapper vmove usr/share/man/man1/murmur-user-wrapper.1 vmove usr/share/man/man1/murmurd.1 vmove usr/share/examples/mumble/murmur.ini - vmove usr/share/examples/mumble/murmur.ini.system } }