git: aa99c00fbd93 - main - audio/mumble: Fix build with protobuf 22+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Dec 2023 17:03:20 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aa99c00fbd9351092d9c44cbd9a4b863c4df5b39
commit aa99c00fbd9351092d9c44cbd9a4b863c4df5b39
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 16:22:23 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-12-14 17:03:03 +0000
audio/mumble: Fix build with protobuf 22+
---
audio/mumble/Makefile | 5 +++--
audio/mumble/files/patch-protobuf | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 548a820ab797..cefc7827c665 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -27,9 +27,9 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
libprotobuf.so:devel/protobuf \
libexpat.so:textproc/expat2
-USES= cmake compiler:c++14-lang cpe desktop-file-utils gl \
+USES= cmake compiler:c++17-lang cpe desktop-file-utils gl \
pkgconfig python:build qt:5 ssl xorg
-USE_CXXSTD= c++14
+USE_CXXSTD= c++17
USE_GL= gl
USE_LDCONFIG= yes
USE_QT= buildtools:build concurrent core gui l10n linguist:build network \
@@ -41,6 +41,7 @@ CMAKE_OFF= bundled-gsl bundled-json bundle-qt-translations bundled-speex \
crash-report g15 server tracy update
CONFIGURE_ENV= MUMBLE_PYTHON=${PYTHON_CMD}
+CXXFLAGS+= -Wno-deprecated-declarations
PLIST_SUB= MUMBLE_VERSION="${DISTVERSION:R}"
diff --git a/audio/mumble/files/patch-protobuf b/audio/mumble/files/patch-protobuf
new file mode 100644
index 000000000000..765ca8ee3f39
--- /dev/null
+++ b/audio/mumble/files/patch-protobuf
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2023-01-18 06:54:18 UTC
++++ CMakeLists.txt
+@@ -37,7 +37,7 @@ project(Mumble
+ set(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/3rdparty")
+ set(PLUGINS_DIR "${CMAKE_SOURCE_DIR}/plugins")
+
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
+
+ list(APPEND CMAKE_MODULE_PATH