From owner-svn-ports-all@freebsd.org Sun Mar 29 10:16:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2001F279BCF; Sun, 29 Mar 2020 10:16:37 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qs2D0tJvz3PF4; Sun, 29 Mar 2020 10:16:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16F9B26395; Sun, 29 Mar 2020 10:16:28 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02TAGRdH021128; Sun, 29 Mar 2020 10:16:27 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02TAGR8X021126; Sun, 29 Mar 2020 10:16:27 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003291016.02TAGR8X021126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 29 Mar 2020 10:16:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529788 - head/games/dangerdeep/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/dangerdeep/files X-SVN-Commit-Revision: 529788 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 10:16:37 -0000 Author: tobik Date: Sun Mar 29 10:16:27 2020 New Revision: 529788 URL: https://svnweb.freebsd.org/changeset/ports/529788 Log: games/dangerdeep: Unbreak build on FreeBSD >= 12.1 src/subsim.cpp:1739:2: error: reference to 'thread' is ambiguous thread::auto_ptr mmusic(new music(use_sound)); ^ src/thread.h:37:7: note: candidate found by name lookup is 'thread' class thread ^ /usr/include/c++/v1/__threading_support:397:24: note: candidate found by name lookup is 'std::__1::thread' class _LIBCPP_TYPE_VIS thread; ^ 2 warnings and 1 error generated. http://beefy6.nyi.freebsd.org/data/121amd64-default/529299/logs/errors/dangerdeep-0.3.0_14.log Added: head/games/dangerdeep/files/patch-src_coastmap.h (contents, props changed) Modified: head/games/dangerdeep/files/patch-src__subsim.cpp Modified: head/games/dangerdeep/files/patch-src__subsim.cpp ============================================================================== --- head/games/dangerdeep/files/patch-src__subsim.cpp Sun Mar 29 10:09:17 2020 (r529787) +++ head/games/dangerdeep/files/patch-src__subsim.cpp Sun Mar 29 10:16:27 2020 (r529788) @@ -1,6 +1,6 @@ ---- ./src/subsim.cpp.orig 2007-06-11 11:16:23.000000000 -0400 -+++ ./src/subsim.cpp 2014-08-11 09:56:15.000000000 -0400 -@@ -31,6 +31,7 @@ +--- src/subsim.cpp.orig 2007-06-11 15:16:23 UTC ++++ src/subsim.cpp +@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, #else #include "oglext/OglExt.h" #endif @@ -8,3 +8,12 @@ #include #include #include +@@ -1735,7 +1736,7 @@ int mymain(list& args) + glEnable(GL_LIGHT0); + + // create and start thread for music handling. +- thread::auto_ptr mmusic(new music(use_sound)); ++ ::thread::auto_ptr mmusic(new music(use_sound)); + mmusic->start(); + + reset_loading_screen(); Added: head/games/dangerdeep/files/patch-src_coastmap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dangerdeep/files/patch-src_coastmap.h Sun Mar 29 10:16:27 2020 (r529788) @@ -0,0 +1,20 @@ +--- src/coastmap.h.orig 2020-03-29 09:04:12 UTC ++++ src/coastmap.h +@@ -151,7 +151,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: +@@ -163,7 +163,7 @@ class coastmap + } + }; + +- thread::auto_ptr myworker; ++ ::thread::auto_ptr myworker; + void construction_threaded(); + + public: