Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mumble: update to 1.4.230.
@ 2022-01-18  2:36 chili-b
  2022-01-18  9:18 ` stacyharper
                   ` (31 more replies)
  0 siblings, 32 replies; 33+ messages in thread
From: chili-b @ 2022-01-18  2:36 UTC (permalink / raw)
  To: ml

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

There is a new 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 53b5e6ebfbd642aaedacb5b4b579a6e5f95d8b30 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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
@ 2022-01-18  9:18 ` stacyharper
  2022-01-18 17:03 ` chili-b
                   ` (30 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: stacyharper @ 2022-01-18  9:18 UTC (permalink / raw)
  To: ml

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

New comment by stacyharper on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1015215584

Comment:
Does it need some new pipewire devel make depencencies ?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
  2022-01-18  9:18 ` stacyharper
@ 2022-01-18 17:03 ` chili-b
  2022-01-18 17:06 ` chili-b
                   ` (29 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-18 17:03 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1015623591

Comment:
> Does it need some new pipewire devel make depencencies ?

Not that I'm aware. I noticed, though, that you need `pipewire-devel` installed at runtime for mumble to recognize that it's available.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 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
                   ` (28 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-18 17:06 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1015623591

Comment:
> Does it need some new pipewire devel make depencencies ?

Not that I'm aware. I noticed, though, that you need `pipewire-devel` installed at runtime for mumble to recognize that it's available.

It's possible, though that adding `pipewire-devel` to the template might resolve this and make pipewire work as expected.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (2 preceding siblings ...)
  2022-01-18 17:06 ` chili-b
@ 2022-01-18 17:19 ` chili-b
  2022-01-19 22:37 ` [PR PATCH] [Updated] " chili-b
                   ` (27 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-18 17:19 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1015623591

Comment:
> Does it need some new pipewire devel make depencencies ?

Not that I'm aware. I noticed, though, that you need `pipewire-devel` installed at runtime for mumble to recognize that it's available.

It's possible, though that adding `pipewire-devel` to the template might resolve this and make pipewire work as expected.

EDIT: I added `pipewire-devel` to makedepends and it seems to behave the same. I don't really understand why it needs the devel package at runtime.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (3 preceding siblings ...)
  2022-01-18 17:19 ` chili-b
@ 2022-01-19 22:37 ` chili-b
  2022-01-19 23:54 ` chili-b
                   ` (26 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-19 22:37 UTC (permalink / raw)
  To: ml

[-- 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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (4 preceding siblings ...)
  2022-01-19 22:37 ` [PR PATCH] [Updated] " chili-b
@ 2022-01-19 23:54 ` chili-b
  2022-01-20  0:05 ` chili-b
                   ` (25 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-19 23:54 UTC (permalink / raw)
  To: ml

[-- 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: 5721 bytes --]

From 80713042361652f7232f2829348ae82622978406 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                       | 49 ++++++++++---------
 2 files changed, 57 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..9b32d2d189e6 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"
+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="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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (5 preceding siblings ...)
  2022-01-19 23:54 ` chili-b
@ 2022-01-20  0:05 ` chili-b
  2022-01-20  0:10 ` chili-b
                   ` (24 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  0:05 UTC (permalink / raw)
  To: ml

[-- 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: 5721 bytes --]

From 79f02663aac1ba91f64f1e7e1f8c89c9052576fa 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                       | 49 ++++++++++---------
 2 files changed, 57 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..9b32d2d189e6 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"
+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="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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (6 preceding siblings ...)
  2022-01-20  0:05 ` chili-b
@ 2022-01-20  0:10 ` chili-b
  2022-01-20  1:09 ` chili-b
                   ` (23 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  0:10 UTC (permalink / raw)
  To: ml

[-- 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: 5731 bytes --]

From f6fef79208dd84ea55e2f598614a75dbf791e557 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                       | 49 ++++++++++---------
 2 files changed, 57 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..023b3c63084a 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"
+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="Ice pkg-config protobuf qt5-qmake 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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (7 preceding siblings ...)
  2022-01-20  0:10 ` chili-b
@ 2022-01-20  1:09 ` chili-b
  2022-01-20  4:26 ` chili-b
                   ` (22 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  1:09 UTC (permalink / raw)
  To: ml

[-- 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: 5788 bytes --]

From 14a76fe8f6d03394bc32c7e45fe25d5259940976 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                       | 51 ++++++++++---------
 2 files changed, 58 insertions(+), 36 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..e3618664d4af 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
+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)"
+makedepends="Ice pkg-config protobuf qt5-qmake qt5-host-tools python3 which
+ 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)"
-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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (8 preceding siblings ...)
  2022-01-20  1:09 ` chili-b
@ 2022-01-20  4:26 ` chili-b
  2022-01-20  5:16 ` chili-b
                   ` (21 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  4:26 UTC (permalink / raw)
  To: ml

[-- 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: 5946 bytes --]

From db9e8c4fc343cef80b8c6b757042a4c70a0f7b95 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                       | 55 ++++++++++---------
 2 files changed, 60 insertions(+), 38 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..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 <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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (9 preceding siblings ...)
  2022-01-20  4:26 ` chili-b
@ 2022-01-20  5:16 ` chili-b
  2022-01-20  5:16 ` chili-b
                   ` (20 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  5:16 UTC (permalink / raw)
  To: ml

[-- 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: 5946 bytes --]

From ad5319679c6e722c1b531053c4e4cb8372081747 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                       | 55 ++++++++++---------
 2 files changed, 60 insertions(+), 38 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..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 <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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (10 preceding siblings ...)
  2022-01-20  5:16 ` chili-b
@ 2022-01-20  5:16 ` chili-b
  2022-01-20  5:39 ` chili-b
                   ` (19 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  5:16 UTC (permalink / raw)
  To: ml

[-- 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: 7092 bytes --]

From 82b49ad662ecb6881d2142a9be5996f07c7028b3 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.

---
 ...X-musl-Explicitly-use-POSIX-basename.patch | 26 +++++++++
 .../patches/link-overlay-against-libGL.patch  | 43 +++++++++++----
 srcpkgs/mumble/template                       | 55 ++++++++++---------
 3 files changed, 86 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..dab86ebe3ba1
--- /dev/null
+++ b/srcpkgs/mumble/patches/FIX-musl-Explicitly-use-POSIX-basename.patch
@@ -0,0 +1,26 @@
+From 4b8bcb104f302273a96a0ec99a6a0b8b326a20c7 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Wed, 19 Jan 2022 23:49:15 -0500
+Subject: [PATCH] FIX(musl): Explicitly use POSIX basename
+
+Explicitly use POSIX basename in plugins/HostLinux.cpp. Otherwise,
+Mumble will not build against musl libc.
+---
+ plugins/HostLinux.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/HostLinux.cpp b/plugins/HostLinux.cpp
+index 58feb673e..8b0073771 100644
+--- a/plugins/HostLinux.cpp
++++ b/plugins/HostLinux.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include <cstring>
+ #include <sstream>
++#include <libgen.h>
+ 
+ #include <sys/uio.h>
+ 
+-- 
+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 <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..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 <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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (11 preceding siblings ...)
  2022-01-20  5:16 ` chili-b
@ 2022-01-20  5:39 ` chili-b
  2022-01-20  7:09 ` chili-b
                   ` (18 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  5:39 UTC (permalink / raw)
  To: ml

[-- 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: 7573 bytes --]

From 7a6bbb802e68b7fdf3ae743e8e995ea4ee73c77f 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.

---
 ...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 <dexter@gaonshatford.ca>
+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 <cstring>
++#include <libgen.h>
+ #include <sstream>
+ 
+ #include <sys/uio.h>
+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 <cstring>
+ #include <elf.h>
+ #include <iostream>
++#include <libgen.h>
+ #include <sstream>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+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 <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..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 <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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (12 preceding siblings ...)
  2022-01-20  5:39 ` chili-b
@ 2022-01-20  7:09 ` chili-b
  2022-01-20  9:37 ` paper42
                   ` (17 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20  7:09 UTC (permalink / raw)
  To: ml

[-- 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: 7570 bytes --]

From 2dc57cc21c12486bf250b8c355152a742dfd535d 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.

---
 ...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 <dexter@gaonshatford.ca>
+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 <cstring>
++#include <libgen.h>
+ #include <sstream>
+ 
+ #include <sys/uio.h>
+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 <cstring>
+ #include <elf.h>
+ #include <iostream>
++#include <libgen.h>
+ #include <sstream>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+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 <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..f0df65fb2b03 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 -Dpulseaudio=ON
+ -Doverlay-xcompile=OFF -Dbundle-qt-translations=OFF -Doss=OFF
+ $(vopt_if portaudio -Dportaudio=ON -Dportaudio=off)
+ $(vopt_if jack -Djackaudio=ON -Djackaudio=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 <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 +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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (13 preceding siblings ...)
  2022-01-20  7:09 ` chili-b
@ 2022-01-20  9:37 ` paper42
  2022-01-20 15:57 ` [PR PATCH] [Updated] " chili-b
                   ` (16 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-01-20  9:37 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017285406

Comment:
Could you try removing depends=mumble from murmur and testing if it still works as expected? https://github.com/void-linux/void-packages/issues/35110#issuecomment-1015537666

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (14 preceding siblings ...)
  2022-01-20  9:37 ` paper42
@ 2022-01-20 15:57 ` chili-b
  2022-01-20 15:57 ` chili-b
                   ` (15 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 15:57 UTC (permalink / raw)
  To: ml

[-- 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: 7616 bytes --]

From c53295ae45bacf3bfa021d75b163ba3fc884e472 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.

---
 ...X-musl-Explicitly-use-POSIX-basename.patch | 39 +++++++++++++
 .../patches/link-overlay-against-libGL.patch  | 43 ++++++++++----
 srcpkgs/mumble/template                       | 57 ++++++++++---------
 3 files changed, 100 insertions(+), 39 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 <dexter@gaonshatford.ca>
+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 <cstring>
++#include <libgen.h>
+ #include <sstream>
+ 
+ #include <sys/uio.h>
+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 <cstring>
+ #include <elf.h>
+ #include <iostream>
++#include <libgen.h>
+ #include <sstream>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+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 <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..b1b1aea352bd 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 <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 +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)"
+	#depends="mumble-${version}_${revision}"
+	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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (15 preceding siblings ...)
  2022-01-20 15:57 ` [PR PATCH] [Updated] " chili-b
@ 2022-01-20 15:57 ` chili-b
  2022-01-20 15:57 ` chili-b
                   ` (14 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 15:57 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017654401

Comment:
@paper42 , It seems to build and work. Is there anything else

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (16 preceding siblings ...)
  2022-01-20 15:57 ` chili-b
@ 2022-01-20 15:57 ` chili-b
  2022-01-20 15:58 ` [PR PATCH] [Updated] " chili-b
                   ` (13 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 15:57 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017654401

Comment:
@paper42 , It seems to build and work. Is there anything else?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (17 preceding siblings ...)
  2022-01-20 15:57 ` chili-b
@ 2022-01-20 15:58 ` chili-b
  2022-01-20 16:01 ` chili-b
                   ` (12 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 15:58 UTC (permalink / raw)
  To: ml

[-- 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: 7572 bytes --]

From 2064ae22bfaf0947f1591d3fdd527fd4c044655f 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.

---
 ...X-musl-Explicitly-use-POSIX-basename.patch | 39 +++++++++++++
 .../patches/link-overlay-against-libGL.patch  | 43 ++++++++++----
 srcpkgs/mumble/template                       | 56 +++++++++----------
 3 files changed, 99 insertions(+), 39 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 <dexter@gaonshatford.ca>
+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 <cstring>
++#include <libgen.h>
+ #include <sstream>
+ 
+ #include <sys/uio.h>
+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 <cstring>
+ #include <elf.h>
+ #include <iostream>
++#include <libgen.h>
+ #include <sstream>
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+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 <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..64e0a56332cd 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 <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 +33,30 @@ 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
 	}
 }

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (18 preceding siblings ...)
  2022-01-20 15:58 ` [PR PATCH] [Updated] " chili-b
@ 2022-01-20 16:01 ` chili-b
  2022-01-20 17:15 ` paper42
                   ` (11 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 16:01 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017657809

Comment:
> Does it need some new pipewire devel make depencencies ?

@stacyharper , In case you haven't also, I looked into this a little bit more and it seems like mumble manages loading the pipewire library fully at runtime.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (19 preceding siblings ...)
  2022-01-20 16:01 ` chili-b
@ 2022-01-20 17:15 ` paper42
  2022-01-20 19:03 ` [PR PATCH] [Updated] " chili-b
                   ` (10 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-01-20 17:15 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017732913

Comment:
This update was done in 5f589a9962d7871deedbaa3d3e92751ace5ef1d6, @Hoshpak probably didn't see this PR. Could you look at the changes, rebase this PR and include only the ones which make sense and are not part of 5f589a9962d7871deedbaa3d3e92751ace5ef1d6? At least removing depends=mumble from murmur is important.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (20 preceding siblings ...)
  2022-01-20 17:15 ` paper42
@ 2022-01-20 19:03 ` chili-b
  2022-01-20 19:05 ` chili-b
                   ` (9 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 19:03 UTC (permalink / raw)
  To: ml

[-- 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: 3409 bytes --]

From 9fdabdfb08b716f4ab593b33a92ad1702c62d009 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 20 Jan 2022 16:57:44 +0100
Subject: [PATCH] python3-jupyterlab_server: update to 2.10.3

---
 .../patches/link-overlay-against-libGL.patch  | 20 ++++++++++++++-----
 srcpkgs/mumble/template                       |  7 +++----
 srcpkgs/python3-jupyterlab_server/template    |  4 ++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
index f301052bc053..8e3d321c7620 100644
--- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
+++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
@@ -1,10 +1,20 @@
---- 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 @@
+--- 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"
-+				"-lGL"
  		)
- 
+@@ -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 9dc76808916e..b3d5d7bf6936 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -16,10 +16,10 @@ makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-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"
+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/"
+homepage="https://mumble.info"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 
@@ -35,8 +35,7 @@ post_install() {
 }
 
 murmur_package() {
-	depends="mumble-${version}_${revision}"
-	short_desc+=" - The murmur server (for mumble)"
+	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
 		vmove usr/bin/mumble-server
 		vmove usr/bin/murmur-user-wrapper
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index fd1b35bc9290..a814eecebc3b 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.9.0
+version=2.10.3
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz"
-checksum=b850bbb59977c4e2c99806a892ddc56f24500b847fd3214b2922596ba81abca9
+checksum=3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a
 # Tests require unpackaged dependencies
 make_check=no
 

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (21 preceding siblings ...)
  2022-01-20 19:03 ` [PR PATCH] [Updated] " chili-b
@ 2022-01-20 19:05 ` chili-b
  2022-01-20 19:05 ` chili-b
                   ` (8 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 19:05 UTC (permalink / raw)
  To: ml

[-- 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: 2478 bytes --]

From 6fa6d86afc6f4365737c2bb70712688f50f6913b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Thu, 20 Jan 2022 14:04:52 -0500
Subject: [PATCH] mumble: update to 1.4.230.

---
 .../patches/link-overlay-against-libGL.patch  | 20 ++++++++++++++-----
 srcpkgs/mumble/template                       |  7 +++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
index f301052bc053..8e3d321c7620 100644
--- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
+++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch
@@ -1,10 +1,20 @@
---- 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 @@
+--- 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"
-+				"-lGL"
  		)
- 
+@@ -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 9dc76808916e..b3d5d7bf6936 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -16,10 +16,10 @@ makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-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"
+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/"
+homepage="https://mumble.info"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 
@@ -35,8 +35,7 @@ post_install() {
 }
 
 murmur_package() {
-	depends="mumble-${version}_${revision}"
-	short_desc+=" - The murmur server (for mumble)"
+	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
 		vmove usr/bin/mumble-server
 		vmove usr/bin/murmur-user-wrapper

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (22 preceding siblings ...)
  2022-01-20 19:05 ` chili-b
@ 2022-01-20 19:05 ` chili-b
  2022-01-20 19:08 ` [PR PATCH] [Updated] " chili-b
                   ` (7 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 19:05 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1017831466

Comment:
> Could you look at the changes, rebase this PR and include only the ones which make sense

Done. I think everything is in order now

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (23 preceding siblings ...)
  2022-01-20 19:05 ` chili-b
@ 2022-01-20 19:08 ` chili-b
  2022-01-21  8:15 ` paper42
                   ` (6 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-20 19:08 UTC (permalink / raw)
  To: ml

[-- 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: 1479 bytes --]

From 1551952a85625347d9107439e11b648aaf524c9f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Thu, 20 Jan 2022 14:04:52 -0500
Subject: [PATCH] mumble: update to 1.4.230.

---
 srcpkgs/mumble/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9dc76808916e..b3d5d7bf6936 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -16,10 +16,10 @@ makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-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"
+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/"
+homepage="https://mumble.info"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 
@@ -35,8 +35,7 @@ post_install() {
 }
 
 murmur_package() {
-	depends="mumble-${version}_${revision}"
-	short_desc+=" - The murmur server (for mumble)"
+	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
 		vmove usr/bin/mumble-server
 		vmove usr/bin/murmur-user-wrapper

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (24 preceding siblings ...)
  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
                   ` (5 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-01-21  8:15 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1018278941

Comment:
please increase the revision, then I think this is good to go

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (25 preceding siblings ...)
  2022-01-21  8:15 ` paper42
@ 2022-01-21 16:32 ` chili-b
  2022-01-21 16:33 ` chili-b
                   ` (4 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-21 16:32 UTC (permalink / raw)
  To: ml

[-- 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: 1648 bytes --]

From c003d3c1aefb05525842da3130b8587adfd340e9 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Thu, 20 Jan 2022 14:04:52 -0500
Subject: [PATCH] mumble: update to 1.4.230.

---
 srcpkgs/mumble/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9dc76808916e..3cddfff58b78 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.230
-revision=1
+revision=2
 wrksrc=mumble-${version}.src
 build_style=cmake
 make_cmd=make
@@ -16,10 +16,10 @@ makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-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"
+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/"
+homepage="https://mumble.info"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 
@@ -35,8 +35,7 @@ post_install() {
 }
 
 murmur_package() {
-	depends="mumble-${version}_${revision}"
-	short_desc+=" - The murmur server (for mumble)"
+	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
 		vmove usr/bin/mumble-server
 		vmove usr/bin/murmur-user-wrapper

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (26 preceding siblings ...)
  2022-01-21 16:32 ` [PR PATCH] [Updated] " chili-b
@ 2022-01-21 16:33 ` chili-b
  2022-01-21 22:48 ` paper42
                   ` (3 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-21 16:33 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1018669111

Comment:
Ok, it is done

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (27 preceding siblings ...)
  2022-01-21 16:33 ` chili-b
@ 2022-01-21 22:48 ` paper42
  2022-01-22  3:25 ` [PR PATCH] [Updated] " chili-b
                   ` (2 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-01-21 22:48 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1018920238

Comment:
the commit message should be changed, this is not an update anymore

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (28 preceding siblings ...)
  2022-01-21 22:48 ` paper42
@ 2022-01-22  3:25 ` chili-b
  2022-01-22  3:26 ` chili-b
  2022-01-23 21:18 ` [PR PATCH] [Merged]: " paper42
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-22  3:25 UTC (permalink / raw)
  To: ml

[-- 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: 1823 bytes --]

From 75438d1cd702aa231cb300c8fefae13a4c877ca0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Thu, 20 Jan 2022 14:04:52 -0500
Subject: [PATCH] mumble: remove murmur dependency on mumble

Remove the dependency on mumble from the murmur subackage. Also change
the `short_desc` and `homepage` fields to reflect the Mumble project's
current website.
---
 srcpkgs/mumble/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9dc76808916e..3cddfff58b78 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.230
-revision=1
+revision=2
 wrksrc=mumble-${version}.src
 build_style=cmake
 make_cmd=make
@@ -16,10 +16,10 @@ makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-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"
+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/"
+homepage="https://mumble.info"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 
@@ -35,8 +35,7 @@ post_install() {
 }
 
 murmur_package() {
-	depends="mumble-${version}_${revision}"
-	short_desc+=" - The murmur server (for mumble)"
+	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
 		vmove usr/bin/mumble-server
 		vmove usr/bin/murmur-user-wrapper

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (29 preceding siblings ...)
  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
  31 siblings, 0 replies; 33+ messages in thread
From: chili-b @ 2022-01-22  3:26 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/35102#issuecomment-1019031425

Comment:
Okay, i've changed the commit message to describe the changes to the template

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Merged]: mumble: update to 1.4.230.
  2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 chili-b
                   ` (30 preceding siblings ...)
  2022-01-22  3:26 ` chili-b
@ 2022-01-23 21:18 ` paper42
  31 siblings, 0 replies; 33+ messages in thread
From: paper42 @ 2022-01-23 21:18 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

mumble: update to 1.4.230.
https://github.com/void-linux/void-packages/pull/35102

Description:
<!-- 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)


^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2022-01-23 21:18 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-18  2:36 [PR PATCH] mumble: update to 1.4.230 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 ` [PR PATCH] [Updated] " chili-b
2022-01-19 23:54 ` 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

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).