From owner-svn-ports-head@freebsd.org Thu Oct 24 14:30:32 2019 Return-Path: Delivered-To: svn-ports-head@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 090D616E4E9; Thu, 24 Oct 2019 14:30:32 +0000 (UTC) (envelope-from amdmi3@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 46zV5g6S9hz3Kmq; Thu, 24 Oct 2019 14:30:31 +0000 (UTC) (envelope-from amdmi3@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 A4982F82F; Thu, 24 Oct 2019 14:30:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9OEUV8s008698; Thu, 24 Oct 2019 14:30:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9OEUVHx008696; Thu, 24 Oct 2019 14:30:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201910241430.x9OEUVHx008696@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 24 Oct 2019 14:30:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515341 - in head/games/xmoto: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/xmoto: . files X-SVN-Commit-Revision: 515341 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2019 14:30:32 -0000 Author: amdmi3 Date: Thu Oct 24 14:30:30 2019 New Revision: 515341 URL: https://svnweb.freebsd.org/changeset/ports/515341 Log: - Add missing USES and dependency on libX11 - Simplify hash_map handling, C++11 way (fixed build on CURRENT) Modified: head/games/xmoto/Makefile head/games/xmoto/files/patch-src-include-xm__hashmap.h Modified: head/games/xmoto/Makefile ============================================================================== --- head/games/xmoto/Makefile Thu Oct 24 14:28:27 2019 (r515340) +++ head/games/xmoto/Makefile Thu Oct 24 14:30:30 2019 (r515341) @@ -23,10 +23,12 @@ LIB_DEPENDS= libode.so:devel/ode \ BROKEN_powerpc64= fails to compile: hashtable.h: no match for call to __gnu_cxx::hash GNU_CONFIGURE= yes -USES= compiler:features dos2unix gmake jpeg localbase lua:51 sqlite +USES= compiler:features dos2unix gl gmake gnome jpeg localbase lua:51 sdl sqlite xorg USE_GNOME= libxml2 USE_SDL= sdl mixer ttf net USE_GL= gl glu +USE_CXXSTD= c++11 +USE_XORG= x11 DOS2UNIX_GLOB= *.cpp *.h CPPFLAGS+= -isystem${LUA_INCDIR} Modified: head/games/xmoto/files/patch-src-include-xm__hashmap.h ============================================================================== --- head/games/xmoto/files/patch-src-include-xm__hashmap.h Thu Oct 24 14:28:27 2019 (r515340) +++ head/games/xmoto/files/patch-src-include-xm__hashmap.h Thu Oct 24 14:30:30 2019 (r515341) @@ -1,28 +1,33 @@ ---- src/include/xm_hashmap.h.orig 2011-10-11 20:18:17 UTC +--- src/include/xm_hashmap.h.orig 2019-10-23 11:51:33 UTC +++ src/include/xm_hashmap.h -@@ -13,13 +13,18 @@ - #include - namespace HashNamespace=std; - #endif +@@ -1,25 +1,11 @@ + #ifndef __XMHASHMAP_H__ + #define __XMHASHMAP_H__ + +-#ifdef __GNUC__ +-#if (__GNUC__ >= 3) +-#include +- namespace HashNamespace=__gnu_cxx; +-#else +-#include +-#define HashNamespace std +-#endif +-#else // #ifdef __GNUC__ +-#include +-namespace HashNamespace=std; +-#endif -struct hashcmp_str { - bool operator()(const char* s1, const char* s2) { - if(s1 == NULL || s2 == NULL) { - return false; -+ -+#ifdef _LIBCPP_VERSION -+namespace __gnu_cxx { -+ template<> struct hash -+ : public unary_function -+ { -+ size_t operator()(const std::string& s) const -+ { -+ return hash()(s.c_str()); - } +- } - return strcmp(s1, s2) == 0; - } --}; -+ }; -+} -+#endif // _LIBCPP_VERSION ++#include ++ ++namespace HashNamespace { ++ template , class Pred = std::equal_to, class Allocator = std::allocator< std::pair >> ++ using hash_map = std::unordered_map; + }; #endif