Date: Sat, 29 Nov 2014 15:33:05 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373630 - in branches/2014Q4/games/xmoto: . files Message-ID: <201411291533.sATFX5ab051497@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Nov 29 15:33:05 2014 New Revision: 373630 URL: https://svnweb.freebsd.org/changeset/ports/373630 QAT: https://qat.redports.org/buildarchive/r373630/ Log: MFH: r373383 - Remove bundled ode to not mix up header files with system ode - Fix broken text rendering Approved by: ports-secteam (rea) Added: branches/2014Q4/games/xmoto/files/patch-src-VTexture.h - copied unchanged from r373383, head/games/xmoto/files/patch-src-VTexture.h branches/2014Q4/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp - copied unchanged from r373383, head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp Modified: branches/2014Q4/games/xmoto/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/xmoto/Makefile ============================================================================== --- branches/2014Q4/games/xmoto/Makefile Sat Nov 29 15:24:20 2014 (r373629) +++ branches/2014Q4/games/xmoto/Makefile Sat Nov 29 15:33:05 2014 (r373630) @@ -55,6 +55,15 @@ DESKTOP_ENTRIES="XMoto" \ "Game;SportsGame;ArcadeGame;" \ false +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 1000000 +BROKEN= does not build +.endif + +post-extract: + @${RM} -rf ${WRKSRC}/src/ode + post-patch: @${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/configure @@ -64,4 +73,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> Copied: branches/2014Q4/games/xmoto/files/patch-src-VTexture.h (from r373383, head/games/xmoto/files/patch-src-VTexture.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/xmoto/files/patch-src-VTexture.h Sat Nov 29 15:33:05 2014 (r373630, copy of r373383, head/games/xmoto/files/patch-src-VTexture.h) @@ -0,0 +1,11 @@ +--- src/VTexture.h.orig 2011-10-12 00:18:35.000000000 +0400 ++++ src/VTexture.h 2014-11-24 22:08:42.749026473 +0300 +@@ -135,7 +135,7 @@ + + void cleanUnregistredTextures(); + +- HashNamespace::hash_map<const char*, int*, HashNamespace::hash<const char*>, hashcmp_str> m_textureSizeCache; ++ HashNamespace::hash_map<std::string, int*> m_textureSizeCache; + std::vector<std::string> m_textureSizeCacheKeys; + std::vector<int*> m_textureSizeCacheValues; + Copied: branches/2014Q4/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp (from r373383, head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp Sat Nov 29 15:33:05 2014 (r373630, copy of r373383, head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp) @@ -0,0 +1,34 @@ +--- src/drawlib/DrawLibOpenGL.cpp.orig 2011-10-12 00:18:26.000000000 +0400 ++++ src/drawlib/DrawLibOpenGL.cpp 2014-11-24 22:08:12.925973647 +0300 +@@ -80,7 +80,7 @@ + /* a glyph from other glyphs */ + /*kejo:why not just grrr create a copy contructor*/ + GLFontGlyph(const std::string& i_value, +- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters); ++ HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters); + virtual ~GLFontGlyph(); + + std::string Value() const; +@@ -132,11 +132,11 @@ + private: + std::vector<std::string> m_glyphsKeys; + std::vector<GLFontGlyph*> m_glyphsValues; +- HashNamespace::hash_map<const char*, GLFontGlyph*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphs; ++ HashNamespace::hash_map<std::string, GLFontGlyph*> m_glyphs; + + std::vector<std::string> m_glyphsLettersKeys; + std::vector<GLFontGlyphLetter*> m_glyphsLettersValues; +- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphsLetters; ++ HashNamespace::hash_map<std::string, GLFontGlyphLetter*> m_glyphsLetters; + + unsigned int getLonguestLineSize(const std::string& i_value, unsigned int i_start = 0, unsigned int i_nbLinesToRead = -1); + }; +@@ -825,7 +825,7 @@ + } + + GLFontGlyph::GLFontGlyph(const std::string& i_value, +- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters) { ++ HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters) { + GLFontGlyph* v_glyph; + std::string v_char; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411291533.sATFX5ab051497>