From nobody Thu Dec 14 17:03:30 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 4SrdwL2F9mz52kpm; Thu, 14 Dec 2023 17:03:30 +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 4SrdwL1lTcz3Z4l; Thu, 14 Dec 2023 17:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573410; 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=XNZWRuMjOdz5ni/iFkSRVwKtBUk9wXKjZ7Bgdlvh6S8=; b=M3J1mf2yVWaPyueCIFZZcJKXZMSCDmiNLf/YJw35m0wI/qulHUdeW5OX/1TviU4bcvJ0fF +6nPGlVcrO/7Nzag11L/mjDPWkxnIajxvFgrzxBazfzRDuSn+gKz8s4CbSS6weicfa1P4C kyjvOeEHIkkO7yJfOjSkVluukxeYoukH/mKC6Dyu+CuCwcYUZVXfLmW9UOT/BS3Sug/fl7 w+hQoWAPiu2c8fKpW6m5rua/QxDPg7bXomZI8MkTPXwZCw4Mjtk2rrwWj9B5nW1t/iGkhz 7Bgg964PNqnvuGXJUs67b6ihRur2gCWV2RyGnmRegoU4Q+m571lQfZIHsEvDqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573410; a=rsa-sha256; cv=none; b=CD5RHgFBFZ2X6kNo0yvngUhHze1KX5vHd87StutYSBi8pzlhYqBGecopURyME8bnfCQX74 65PQShlD+DoYNIa21bGTyCu1cKZJrCSt4NHaFhHwAdRP+90Lkgp/W/HrZ7Bf9EUDDp+ApI qSbyWgGxQzYv+qIsj2y+C2k7xJHfg70HRuCoOds+JtBjg/Tw5QPjE/P5potu0PGkXeXEcI ZeXxVum2VhSUQ8wOJETzy1Y7yETGouOnwEsU0dCeG5gqiK0bUZie+Fb9gjGBpBXezgbsSm hjuMEhQihqNVXJPbl/Sr2H6XQSnGKDA0j8S36UMTxDsiLIoFDP/Pb2bLjumMtg== 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=1702573410; 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=XNZWRuMjOdz5ni/iFkSRVwKtBUk9wXKjZ7Bgdlvh6S8=; b=FM5cCWFUmGbQwcMgC/XUOMnXnMaSF0b2uFpRwH3rRR7AXaPGsk33V2fsggJA9c+HcLdQE+ axpJyzhrdy3+e3Bdvbwk9kO4/DpHb6lcyXLlh2UqIp65AmQ6F1xKukK96vvfI1rNIzGf9a mIjIe60aUEEtIq/iRiCPswdMFDCDOFujkJ3CNr+Oej9q/3wXlAaj1a4NkWdWqm5JebCmFN HeTDdNH+FqWX2arDU0ezgPqrue+K2kJSRfZcF6CCkcsv50SxIRrJVvjKAbHCCgBy4YD1WV eyQOZpAY3A43VVhiBRGohFVfXYYtn+yzvNuebnJiQCVPXOzzlglAPS8pKWYzkA== 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 4SrdwL0WfqzbkT; Thu, 14 Dec 2023 17:03:30 +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 3BEH3Ujr016803; Thu, 14 Dec 2023 17:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3UgR016800; Thu, 14 Dec 2023 17:03:30 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:30 GMT Message-Id: <202312141703.3BEH3UgR016800@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: f379f77f83fa - main - games/pink-pony: 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: f379f77f83faf391ed852dd9c53088677a2fdaac Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f379f77f83faf391ed852dd9c53088677a2fdaac commit f379f77f83faf391ed852dd9c53088677a2fdaac Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:30 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:05 +0000 games/pink-pony: Fix build with protobuf 22+ --- games/pink-pony/Makefile | 6 ++++-- games/pink-pony/files/patch-protobuf | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index 62c7cfdfdd92..7e04ac3d3e8a 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -19,12 +19,14 @@ LIB_DEPENDS= libIL.so:graphics/devil \ USE_GITHUB= yes GH_ACCOUNT= ginkgo -USES= pkgconfig scons compiler:c++11-lang gl sdl -USE_CXXSTD= c++11 +USES= pkgconfig scons compiler:c++17-lang gl sdl +USE_CXXSTD= c++17 USE_GL= gl glu USE_SDL= mixer SUB_FILES= pink-pony.sh +LDFLAGS+= -labsl_log_internal_check_op -labsl_log_internal_message + PORTDOCS= * PORTDATA= * diff --git a/games/pink-pony/files/patch-protobuf b/games/pink-pony/files/patch-protobuf new file mode 100644 index 000000000000..e087cfc1ecf9 --- /dev/null +++ b/games/pink-pony/files/patch-protobuf @@ -0,0 +1,22 @@ +--- src/Menu.hh.orig 2014-01-01 01:39:36 UTC ++++ src/Menu.hh +@@ -28,7 +28,7 @@ class Menu + Config* config; + Skydome* skydome; + +- auto_ptr heightmap; ++ unique_ptr heightmap; + + Camera camera; + +--- src/cinquo.hh.orig 2014-01-01 01:39:36 UTC ++++ src/cinquo.hh +@@ -29,7 +29,7 @@ using std::cerr; + using std::vector; + using std::list; + using std::map; +-using std::auto_ptr; ++using std::unique_ptr; + using std::max; + using std::min; +