From nobody Thu Dec 14 17:03:20 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Srdw91tkPz52l47; Thu, 14 Dec 2023 17:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Srdw91S89z3YPF; Thu, 14 Dec 2023 17:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQObjeIhiPJxBj0tbjddR6l/8NQeP6CeZZbFqY1lO4w=; b=INgTUvHP+5B5/VVKedllZG8i3yE3HC53FgaySbwV49Gx5OMoa2YTF3zT7fRwRJwn7uXCNA 6yhtXmPS9pnm6rmIWTZkotfHwbjeMGp88cg9Vm5EENkrxvo4g4+B9cFzvHHRED1NVITcJe yHENyqZ29LAdkmi1lhv+lZK2hIHLFrKlxNxl7Ho4rMJ8SWDVR6aZ4FIPZbcnXFuC5pklqL GiTnHDGKkxSKx56jXIufb3iCM/MS8x31QGWmP24+0oavq0DxNck5HaSsiqX4+jQFafichx YA+3p2nGBpsTtRapyfnY2zZ9fkRwJKnkG8x2HTHjAh/Fbdy5iIglrEpkeSur0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573401; a=rsa-sha256; cv=none; b=bRhQORElODBqKnq/O/1U99KEO5hBUA3q/1i98PMQq7o0O2YeLKsOlhFk5Hiy+fJLamCTTs tZu1q1RUjBxl3QodAEGKvaffYsnE282BkKxGrIkZmLf/fdNPES3+Ln389tv1g+o+dUYc7o zqJYsxEwjLzgDt7/Kmvjr+3x7igdVFBb1+fhv5I5l8y6ihmDSVARM0b1Bw4yRna0atPjhZ oL/ps9Ni4229r7LTcVmTPleLO+9Bm8hsLHWXVC1sp+0dah75DMgTFCbM97PspxVjLxflD5 BG2laZaHy74Bwf+RpSHo8jirmsduwsaLfrPfxcl/L8hChJ83izJS+NiNT3s+6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQObjeIhiPJxBj0tbjddR6l/8NQeP6CeZZbFqY1lO4w=; b=rfo7F1VV9atxzWk1cR2HOhBnImle8S49syWMiSi4+cZZLTsjqXoeiLUwiBXxIify1+R2y9 MOvsp1JPRxgrrPOYBZsIsIQdizx5chiitjaAexqZaMhPVvwUSD4P6lX8Z0z4A26TfOp4oJ oeuIRUwe/QGXUJeG22oVMRG0KniXrAWZmanEX2CR7BRe3dexGQdVGHk4F9vTU9E81swJj/ +QNDxleGR0ZYIUSbGr/6Aoh5cF3rfcJl3+Pxcqo97vpH/WJXRg/+V5kY5Z/t1JBSan9Htj 9++EDtdy94poTWt/nkFJHEWMUpXY11NkvorV/N3Z1DV4loPUCsrhnR978Y553A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Srdw90Yttzby0; Thu, 14 Dec 2023 17:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEH3KQ1016425; Thu, 14 Dec 2023 17:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3KPf016422; Thu, 14 Dec 2023 17:03:20 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:20 GMT Message-Id: <202312141703.3BEH3KPf016422@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: aa99c00fbd93 - main - audio/mumble: Fix build with protobuf 22+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa99c00fbd9351092d9c44cbd9a4b863c4df5b39 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa99c00fbd9351092d9c44cbd9a4b863c4df5b39 commit aa99c00fbd9351092d9c44cbd9a4b863c4df5b39 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:23 +0000 Commit: Po-Chuan Hsieh 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