Am Tue, Jan 05, 2021 at 09:07:44PM +0100 schrieb Christian Weisgerber:
> games/dangerdeep fails to build with libc++ 10.0.
>
> Here's a build fix, adapted from FreeBSD (which has since removed
> the port because of the scons -> python2 dependency).
>
> OK?
I'm not very versed in C++, but this looks good to me, ok patrick@
> Index: patches/patch-src_coastmap_h
> ===================================================================
> RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_coastmap_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_coastmap_h
> --- patches/patch-src_coastmap_h 30 Apr 2017 08:24:33 -0000 1.1
> +++ patches/patch-src_coastmap_h 5 Jan 2021 20:03:40 -0000
> @@ -1,4 +1,5 @@
> $OpenBSD: patch-src_coastmap_h,v 1.1 2017/04/30 08:24:33 espie Exp $
> +Index: src/coastmap.h
> --- src/coastmap.h.orig
> +++ src/coastmap.h
> @@ -90,7 +90,7 @@ class coastsegment (public)
> @@ -10,3 +11,21 @@ $OpenBSD: patch-src_coastmap_h,v 1.1 201
>
> // some attributes used for map reading/processing
> std::vector<Uint8> themap; // pixel data of map file, y
> points up, like in OpenGL
> +@@ -148,7 +148,7 @@ class coastmap
> + void process_coastline(int x, int y);
> + void process_segment(int x, int y);
> +
> +- class worker : public thread
> ++ class worker : public ::thread
> + {
> + coastmap& cm;
> + public:
> +@@ -160,7 +160,7 @@ class coastmap
> + }
> + };
> +
> +- thread::auto_ptr<worker> myworker;
> ++ ::thread::auto_ptr<worker> myworker;
> + void construction_threaded();
> +
> + public:
> Index: patches/patch-src_game_h
> ===================================================================
> RCS file: /cvs/ports/games/dangerdeep/patches/patch-src_game_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_game_h
> --- patches/patch-src_game_h 30 Apr 2017 08:56:45 -0000 1.1
> +++ patches/patch-src_game_h 5 Jan 2021 20:03:40 -0000
> @@ -1,12 +1,25 @@
> $OpenBSD: patch-src_game_h,v 1.1 2017/04/30 08:56:45 espie Exp $
> +Index: src/game.h
> --- src/game.h.orig
> +++ src/game.h
> -@@ -212,7 +212,7 @@ class game (protected)
> +@@ -210,9 +210,9 @@ class game (protected)
> + void simulate_objects_mt(double delta_t, unsigned idxoff, unsigned
> idxmod, bool record,
> + double& nearest_contact);
>
> - class simulate_worker : public thread
> +- class simulate_worker : public thread
> ++ class simulate_worker : public ::thread
> {
> - mutex mtx;
> + dd::mutex mtx;
> condvar cond;
> condvar condfini;
> game& gm;
> +@@ -230,7 +230,7 @@ class game (protected)
> + double sync();
> + };
> +
> +- thread::auto_ptr<simulate_worker> myworker;
> ++ ::thread::auto_ptr<simulate_worker> myworker;
> +
> + player_info playerinfo;
> +
> --
> Christian "naddy" Weisgerber [email protected]
>
