From 7a6bbb802e68b7fdf3ae743e8e995ea4ee73c77f Mon Sep 17 00:00:00 2001 From: chili-b Date: Mon, 17 Jan 2022 21:32:41 -0500 Subject: [PATCH] mumble: update to 1.4.230. --- ...X-musl-Explicitly-use-POSIX-basename.patch | 39 +++++++++++++ .../patches/link-overlay-against-libGL.patch | 43 +++++++++++---- srcpkgs/mumble/template | 55 ++++++++++--------- 3 files changed, 99 insertions(+), 38 deletions(-) create mode 100644 srcpkgs/mumble/patches/FIX-musl-Explicitly-use-POSIX-basename.patch diff --git a/srcpkgs/mumble/patches/FIX-musl-Explicitly-use-POSIX-basename.patch b/srcpkgs/mumble/patches/FIX-musl-Explicitly-use-POSIX-basename.patch new file mode 100644 index 000000000000..2f39e2023c0d --- /dev/null +++ b/srcpkgs/mumble/patches/FIX-musl-Explicitly-use-POSIX-basename.patch @@ -0,0 +1,39 @@ +From 5253e7409a409486928fb5d86ca9f1a6b3003dd0 Mon Sep 17 00:00:00 2001 +From: Dexter Gaon-Shatford +Date: Wed, 19 Jan 2022 23:49:15 -0500 +Subject: [PATCH] FIX(musl): Explicitly use POSIX basename + +Explicitly use POSIX basename. Otherwise, +Mumble will not build against musl libc. +--- + plugins/HostLinux.cpp | 1 + + plugins/mumble_positional_audio_linux.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/plugins/HostLinux.cpp b/plugins/HostLinux.cpp +index 47c182d07..b133b6f26 100644 +--- a/plugins/HostLinux.cpp ++++ b/plugins/HostLinux.cpp +@@ -8,6 +8,7 @@ + #include "mumble_positional_audio_utils.h" + + #include ++#include + #include + + #include +diff --git a/plugins/mumble_positional_audio_linux.h b/plugins/mumble_positional_audio_linux.h +index 9b9542190..9a240591d 100644 +--- a/plugins/mumble_positional_audio_linux.h ++++ b/plugins/mumble_positional_audio_linux.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch index cfeaf9bf8c5b..5cb0de7a9635 100644 --- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch +++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch @@ -1,11 +1,32 @@ ---- a/overlay_gl/overlay_gl.pro -+++ b/overlay_gl/overlay_gl.pro -@@ -22,7 +22,7 @@ unix:!macx { - - DEFINES += TARGET_UNIX - linux* { -- LIBS *= -lrt -ldl -+ LIBS *= -lGL -lrt -ldl - } - QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) - QMAKE_LFLAGS -= -Wl,--no-undefined +From 85495335c2d120ea2d7ca166ae6fd41655b42955 Mon Sep 17 00:00:00 2001 +From: Dexter Gaon-Shatford +Date: Sun, 16 Jan 2022 22:01:08 -0500 +Subject: [PATCH] link overlay against libGL + +--- + overlay_gl/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/overlay_gl/CMakeLists.txt b/overlay_gl/CMakeLists.txt +index 47bfe3948..13166982c 100644 +--- a/overlay_gl/CMakeLists.txt ++++ b/overlay_gl/CMakeLists.txt +@@ -79,6 +79,7 @@ if(NOT APPLE) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + target_link_libraries(overlay_gl + PRIVATE ++ "-lGL" + "-ldl" + "-lrt" + ) +@@ -86,6 +87,7 @@ if(NOT APPLE) + if(TARGET overlay_gl_x86) + target_link_libraries(overlay_gl_x86 + PRIVATE ++ "-lGL" + "-ldl" + "-lrt" + ) +-- +2.34.1 + diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 69a5cb3c7961..2b18c2097dc9 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,25 +1,28 @@ # 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" -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 - pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel - speech-dispatcher-devel speex-devel $(vopt_if portaudio portaudio-devel)" -depends="desktop-file-utils qt5-plugin-sqlite" -short_desc="Open source, low-latency, high quality voice chat for gaming" +version=1.4.230 +revision=1 +wrksrc="${pkgname}-${version}.src" +build_style=cmake +configure_args="-Dwarnings-as-errors=OFF -Dbundled-celt=ON + -Dbundled-opus=OFF -Dupdate=OFF -Dbundled-speex=off -Dg15=OFF + CONFIG+=pulseaudio -Doverlay-xcompile=OFF + $(vopt_if jack -Djackaudio=ON -Djackaudio=OFF) -Dbundle-qt-translations=OFF + -Doss=OFF $(vopt_if portaudio -Dportaudio=ON -Dportaudio=off)" +hostmakedepends="qt5-qmake python3 which pkg-config qt5-host-tools protobuf Ice" +makedepends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql + qt5-plugin-sqlite qt5-plugin-tds Ice-devel MesaLib-devel + avahi-compat-libs-devel boost-devel libcap-devel openssl-devel libsndfile-devel + opus-devel protobuf-devel pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel + qt5-svg-devel speech-dispatcher-devel speex-devel + $(vopt_if portaudio portaudio-devel) poco-devel qt5-tools-devel" +depends="desktop-file-utils qt5 qt5-plugin-sqlite opus openssl" +short_desc="Open source, low latency, high quality voice chat" 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 +homepage="https://mumble.info" +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" @@ -30,33 +33,31 @@ do_install() { vmkdir usr/share/applications vmkdir usr/share/icons/hicolor/scalable/apps - vbin ${wrksrc}/release/murmurd + vbin ${wrksrc}/build/mumble-server 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 + vbin ${wrksrc}/build/mumble vman ${wrksrc}/man/mumble.1 - cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble - cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble + cp ${wrksrc}/build/*.so* ${DESTDIR}/usr/lib/mumble + cp -r ${wrksrc}/build/plugins/* ${DESTDIR}/usr/lib/mumble - cp ${wrksrc}/scripts/mumble.desktop ${DESTDIR}/usr/share/applications + cp ${wrksrc}/scripts/org.mumble_voip.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 } murmur_package() { depends="mumble-${version}_${revision}" - short_desc+=" - The murmur server (for mumble)" + short_desc+=" (mumble-server)" 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 } }