commit: fd0cd4f8f688d02ec14695863039c979bcf0c6c1
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 22:46:57 2025 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 21:29:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0cd4f8
net-voip/mumble: update live ebuild
- utf8cpp patch merged upstream.
- Dependency on GSL removed.
- Fixed version dependency on SOCI.
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
net-voip/mumble/files/mumble-1.6-unbundle-utf8cpp.patch | 12 ------------
net-voip/mumble/mumble-9999.ebuild | 9 ++-------
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/net-voip/mumble/files/mumble-1.6-unbundle-utf8cpp.patch
b/net-voip/mumble/files/mumble-1.6-unbundle-utf8cpp.patch
deleted file mode 100644
index 880a3393d9f0..000000000000
--- a/net-voip/mumble/files/mumble-1.6-unbundle-utf8cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -152,7 +152,8 @@ set(CMAKE_UNITY_BUILD_BATCH_SIZE 40)
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${lto})
- set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF)
-
--add_subdirectory(${3RDPARTY_DIR}/utfcpp)
-+find_pkg("utf8cpp" REQUIRED)
-+add_library(utfcpp ALIAS utf8cpp::utf8cpp)
-
- if(g15 AND WIN32)
- add_subdirectory("helpers/g15helper")
diff --git a/net-voip/mumble/mumble-9999.ebuild
b/net-voip/mumble/mumble-9999.ebuild
index 58e569aaf77d..71fb182a9a36 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -44,8 +44,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-cpp/cli11
- dev-cpp/ms-gsl
- dev-db/soci[sqlite]
+ >=dev-db/soci-4.1.0[sqlite]
>=dev-libs/openssl-1.0.0b:0=
dev-libs/poco:=[util,xml,zip]
>=dev-libs/protobuf-2.2.0:=
@@ -80,10 +79,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}/${PN}-1.6-unbundle-utf8cpp.patch"
-)
-
pkg_setup() {
python-any-r1_pkg_setup
}
@@ -100,12 +95,12 @@ src_configure() {
local mycmakeargs=(
-Dalsa="$(usex alsa)"
-Dbundled-cli11="OFF"
- -Dbundled-gsl="OFF"
-Dbundled-json="OFF"
-Dbundled-rnnoise="OFF"
-Dbundled-spdlog="OFF"
-Dbundled-soci="OFF"
-Dbundled-speex="OFF"
+ -Dbundled-utfcpp="OFF"
-Dg15="OFF"
-Djackaudio="$(usex jack)"
-Doverlay="ON"
