| 1 |
commit: 9c19562ac6472473a6003b37816c33386db7fa23 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 25 16:07:21 2022 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 25 16:08:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c19562a |
| 7 |
|
| 8 |
media-sound/mumble: Added dev-cpp/nlohmann_json to DEPEND in live ebuild |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/834030 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/mumble/files/mumble-9999-system_json.patch | 18 ++++++++++++++++++ |
| 14 |
media-sound/mumble/mumble-9999.ebuild | 5 +++++ |
| 15 |
2 files changed, 23 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-sound/mumble/files/mumble-9999-system_json.patch b/media-sound/mumble/files/mumble-9999-system_json.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..2be7553d50ef |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-sound/mumble/files/mumble-9999-system_json.patch |
| 22 |
@@ -0,0 +1,18 @@ |
| 23 |
+diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt |
| 24 |
+index bb8df1671..51f83850e 100644 |
| 25 |
+--- a/src/mumble/CMakeLists.txt |
| 26 |
++++ b/src/mumble/CMakeLists.txt |
| 27 |
+@@ -472,12 +472,7 @@ else() |
| 28 |
+ endif() |
| 29 |
+ |
| 30 |
+ |
| 31 |
+-set(JSON_BuildTests OFF CACHE INTERNAL "") |
| 32 |
+-set(JSON_ImplicitConversions OFF CACHE INTERNAL "") |
| 33 |
+-add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/") |
| 34 |
+- |
| 35 |
+-target_link_libraries(mumble_client_object_lib PUBLIC nlohmann_json::nlohmann_json) |
| 36 |
+- |
| 37 |
++find_pkg("nlohmann_json" REQUIRED) |
| 38 |
+ find_pkg("SndFile;LibSndFile;sndfile" REQUIRED) |
| 39 |
+ |
| 40 |
+ # Check if sndfile version supports opus |
| 41 |
|
| 42 |
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild |
| 43 |
index 0f0d04d692c3..a5cfa6d410b7 100644 |
| 44 |
--- a/media-sound/mumble/mumble-9999.ebuild |
| 45 |
+++ b/media-sound/mumble/mumble-9999.ebuild |
| 46 |
@@ -57,6 +57,7 @@ RDEPEND=" |
| 47 |
zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
| 48 |
" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
+ dev-cpp/nlohmann_json |
| 51 |
dev-qt/qtconcurrent:5 |
| 52 |
dev-qt/qttest:5 |
| 53 |
>=dev-libs/boost-1.41.0 |
| 54 |
@@ -70,6 +71,10 @@ BDEPEND=" |
| 55 |
src_prepare() { |
| 56 |
sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die |
| 57 |
|
| 58 |
+ if [[ "${PV}" == *9999 ]] ; then |
| 59 |
+ PATCHES+=( "${FILESDIR}/${P}-system_json.patch" ) |
| 60 |
+ fi |
| 61 |
+ |
| 62 |
# required because of xdg.eclass also providing src_prepare |
| 63 |
cmake_src_prepare |
| 64 |
} |
Archives