[gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/files/, media-sound/mumble/

[Lars Wendler]

commit:     583639c62e8515396d1d516cff9d1b66b12b151d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 10:26:15 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 10:26:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583639c6

media-sound/mumble: Drop merged patch

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../mumble/files/mumble-9999-system_json.patch     | 60 ----------------------
 media-sound/mumble/mumble-9999.ebuild              |  4 --
 2 files changed, 64 deletions(-)

diff --git a/media-sound/mumble/files/mumble-9999-system_json.patch b/media-sound/mumble/files/mumble-9999-system_json.patch
deleted file mode 100644
index bb04dc0a01e0..000000000000
--- a/media-sound/mumble/files/mumble-9999-system_json.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a239ccf62369880a0b08faf01021e7961ec1cc5a Mon Sep 17 00:00:00 2001
-From: Robert Adam <dev@×××××××××××.de>
-Date: Fri, 25 Feb 2022 18:37:51 +0100
-Subject: [PATCH] BUILD(client): Add option to use system JSON lib
-
-This commit introduces an option that toggles between using a bundled
-version of nlohmann_json (default) and looking for a version installed
-on the system instead.
-
-Fixes #5584
----
- docs/dev/build-instructions/cmake_options.md |  5 +++++
- src/mumble/CMakeLists.txt                    | 11 ++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md
-index 2a02b200b7..b395251069 100644
---- a/docs/dev/build-instructions/cmake_options.md
-+++ b/docs/dev/build-instructions/cmake_options.md
-@@ -34,6 +34,11 @@ Bundle Qt's translations as well
- Build the included version of CELT instead of looking for one on the system.
- (Default: ON)
- 
-+### bundled-json
-+
-+Build the included version of nlohmann_json instead of looking for one on the system
-+(Default: ON)
-+
- ### bundled-opus
- 
- Build the included version of Opus instead of looking for one on the system.
-diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
-index bb8df16714..5f1c14ba97 100644
---- a/src/mumble/CMakeLists.txt
-+++ b/src/mumble/CMakeLists.txt
-@@ -27,6 +27,7 @@ option(bundled-celt "Build the included version of CELT instead of looking for o
- option(bundled-speex "Build the included version of Speex instead of looking for one on the system." ON)
- option(rnnoise "Use RNNoise for machine learning noise reduction." ON)
- option(bundled-rnnoise "Build the included version of RNNoise instead of looking for one on the system." ${rnnoise})
-+option(bundled-json "Build the included version of nlohmann_json instead of looking for one on the system" ON)
- 
- option(manual-plugin "Include the built-in \"manual\" positional audio plugin." ON)
- 
-@@ -472,9 +473,13 @@ else()
- endif()
- 
- 
--set(JSON_BuildTests OFF CACHE INTERNAL "")
--set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
--add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
-+if(bundled-json)
-+	set(JSON_BuildTests OFF CACHE INTERNAL "")
-+	set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
-+	add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/")
-+else()
-+	find_pkg("nlohmann_json" REQUIRED)
-+endif()
- 
- target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json)
- 

diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index abee2e9d032d..7574a19a1ad6 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -71,10 +71,6 @@ BDEPEND="
 src_prepare() {
 	sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
 
-	if [[ "${PV}" == *9999 ]] ; then
-		PATCHES+=( "${FILESDIR}/${P}-system_json.patch" )
-	fi
-
 	# required because of xdg.eclass also providing src_prepare
 	cmake_src_prepare
 }