Date: Wed, 19 Aug 2015 14:09:29 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394783 - in head/games/apricots: . files Message-ID: <201508191409.t7JE9TnQ066638@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Aug 19 14:09:29 2015 New Revision: 394783 URL: https://svnweb.freebsd.org/changeset/ports/394783 Log: - Switch to options helpers - Regenerate patches with `make makepatch` - Fix 64 bit issue Modified: head/games/apricots/Makefile head/games/apricots/files/patch-apricots-init.cpp head/games/apricots/files/patch-apricots-sampleio.cpp Modified: head/games/apricots/Makefile ============================================================================== --- head/games/apricots/Makefile Wed Aug 19 13:58:06 2015 (r394782) +++ head/games/apricots/Makefile Wed Aug 19 14:09:29 2015 (r394783) @@ -31,13 +31,9 @@ DESKTOP_ENTRIES="Apricots" \ OPTIONS_DEFINE= DOCS OPENAL OPTIONS_DEFAULT=OPENAL -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENAL} -USES+= openal:al,alut -CPPFLAGS+= -DAP_AUDIO_OPENAL -LDFLAGS+= -L${LOCALBASE}/lib -lopenal -lalut -.endif +OPENAL_USES= openal:al,alut +OPENAL_CPPFLAGS=-DAP_AUDIO_OPENAL +OPENAL_LDFLAGS= -L${LOCALBASE}/lib -lopenal -lalut do-build: cd ${WRKSRC}/apricots && ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} \ Modified: head/games/apricots/files/patch-apricots-init.cpp ============================================================================== --- head/games/apricots/files/patch-apricots-init.cpp Wed Aug 19 13:58:06 2015 (r394782) +++ head/games/apricots/files/patch-apricots-init.cpp Wed Aug 19 14:09:29 2015 (r394783) @@ -1,6 +1,24 @@ ---- apricots/init.cpp.orig 2013-10-18 03:20:08.162773332 +0400 -+++ apricots/init.cpp 2013-10-18 03:21:49.134378818 +0400 -@@ -275,7 +275,7 @@ +--- apricots/init.cpp.orig 2015-08-19 14:00:09 UTC ++++ apricots/init.cpp +@@ -218,7 +218,7 @@ void init_gameconstants(gamedata &g){ + string getConfig(string config, string name, string defval) + { + // Pull out just the name line +- unsigned int ndx = config.find(name); ++ size_t ndx = config.find(name); + + if (ndx == string::npos) + { +@@ -241,7 +241,7 @@ string getConfig(string config, string n + int getConfig(string config, string name, int defval, int min, int max) + { + // Pull out just the name line +- unsigned int ndx = config.find(name); ++ size_t ndx = config.find(name); + + if (ndx == string::npos) + { +@@ -275,7 +275,7 @@ int getConfig(string config, string name void init_gamedata(gamedata &g){ //--JAM: Read from config file Modified: head/games/apricots/files/patch-apricots-sampleio.cpp ============================================================================== --- head/games/apricots/files/patch-apricots-sampleio.cpp Wed Aug 19 13:58:06 2015 (r394782) +++ head/games/apricots/files/patch-apricots-sampleio.cpp Wed Aug 19 14:09:29 2015 (r394783) @@ -1,7 +1,6 @@ -Patch to build with newer openal. Not sure whether it doesn't leak memory ---- apricots/sampleio.cpp.orig 2003-08-06 03:21:22.000000000 +0400 -+++ apricots/sampleio.cpp 2010-04-07 18:32:05.000000000 +0400 -@@ -74,28 +74,21 @@ +--- apricots/sampleio.cpp.orig 2015-08-19 14:00:09 UTC ++++ apricots/sampleio.cpp +@@ -74,28 +74,21 @@ void sampleio :: init(int nsamples, char alListenerfv(AL_ORIENTATION, front ); // Load in samples @@ -35,7 +34,7 @@ Patch to build with newer openal. Not su } // Generate Sources -@@ -107,8 +100,6 @@ +@@ -107,8 +100,6 @@ void sampleio :: init(int nsamples, char alSourcefv(sources[j], AL_ORIENTATION, back ); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508191409.t7JE9TnQ066638>