git: f379f77f83fa - main - games/pink-pony: Fix build with protobuf 22+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Dec 2023 17:03:30 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f379f77f83faf391ed852dd9c53088677a2fdaac
commit f379f77f83faf391ed852dd9c53088677a2fdaac
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 16:22:30 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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> heightmap;
++ unique_ptr<Heightmap> 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;
+