Github messages for voidlinux
 help / color / mirror / Atom feed
From: chili-b <chili-b@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
Date: Wed, 19 Jan 2022 23:37:09 +0100	[thread overview]
Message-ID: <20220119223709.GrVqbHU9rIMX5Yj1Y7EYfMj-Te8VkRHLGLXLS4W9JQs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35102@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

There is an updated pull request by chili-b against master on the void-packages repository

https://github.com/chili-b/void-packages mumble
https://github.com/void-linux/void-packages/pull/35102

mumble: update to 1.4.230.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/35102.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mumble-35102.patch --]
[-- Type: text/x-diff, Size: 5695 bytes --]

From 3d6438f1a06dc50593ba27a544e121af01fe2e2a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Mon, 17 Jan 2022 21:32:41 -0500
Subject: [PATCH] mumble: update to 1.4.230.

---
 .../patches/link-overlay-against-libGL.patch  | 43 ++++++++++++-----
 srcpkgs/mumble/template                       | 48 +++++++++----------
 2 files changed, 56 insertions(+), 35 deletions(-)

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 <dexter@gaonshatford.ca>
+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..6048c55f470b 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,25 +1,27 @@
 # 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"
+version=1.4.230
+revision=1
+wrksrc="${pkgname}-${version}.src"
+build_style=cmake
+configure_args="-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="Ice pkg-config protobuf qt5-host-tools python3 which
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
 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"
+ 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 <helmut@pozimski.eu>"
 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 +32,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
 	}
 }

  parent reply	other threads:[~2022-01-19 22:37 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-18  2:36 [PR PATCH] " chili-b
2022-01-18  9:18 ` stacyharper
2022-01-18 17:03 ` chili-b
2022-01-18 17:06 ` chili-b
2022-01-18 17:19 ` chili-b
2022-01-19 22:37 ` chili-b [this message]
2022-01-19 23:54 ` [PR PATCH] [Updated] " chili-b
2022-01-20  0:05 ` chili-b
2022-01-20  0:10 ` chili-b
2022-01-20  1:09 ` chili-b
2022-01-20  4:26 ` chili-b
2022-01-20  5:16 ` chili-b
2022-01-20  5:16 ` chili-b
2022-01-20  5:39 ` chili-b
2022-01-20  7:09 ` chili-b
2022-01-20  9:37 ` paper42
2022-01-20 15:57 ` [PR PATCH] [Updated] " chili-b
2022-01-20 15:57 ` chili-b
2022-01-20 15:57 ` chili-b
2022-01-20 15:58 ` [PR PATCH] [Updated] " chili-b
2022-01-20 16:01 ` chili-b
2022-01-20 17:15 ` paper42
2022-01-20 19:03 ` [PR PATCH] [Updated] " chili-b
2022-01-20 19:05 ` chili-b
2022-01-20 19:05 ` chili-b
2022-01-20 19:08 ` [PR PATCH] [Updated] " chili-b
2022-01-21  8:15 ` paper42
2022-01-21 16:32 ` [PR PATCH] [Updated] " chili-b
2022-01-21 16:33 ` chili-b
2022-01-21 22:48 ` paper42
2022-01-22  3:25 ` [PR PATCH] [Updated] " chili-b
2022-01-22  3:26 ` chili-b
2022-01-23 21:18 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220119223709.GrVqbHU9rIMX5Yj1Y7EYfMj-Te8VkRHLGLXLS4W9JQs@z \
    --to=chili-b@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).