Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting9.git;a=commitdiff;h=82d348975c9484a3c949da88b9ccc5334a5994e0
commit 82d348975c9484a3c949da88b9ccc5334a5994e0 Author: James Buren <[email protected]> Date: Mon Dec 31 11:14:49 2012 -0600 spring-91.0-3-x86_64 * rebuild with boost * remove the stupid attempt at fixing TIME_UTC bug diff --git a/source/games-extra/spring/FrugalBuild b/source/games-extra/spring/FrugalBuild index 5b261a0..2dbce73 100644 --- a/source/games-extra/spring/FrugalBuild +++ b/source/games-extra/spring/FrugalBuild @@ -4,13 +4,13 @@ pkgname=spring pkgver=91.0 -pkgrel=2 +pkgrel=3 pkgdesc="A free 3D game engine for the real-time-strategy (RTS) game Total Annihilation" url="http://spring.clan-sy.com"; -depends=('glew' 'devil' 'libboost>=1.49.0-2' 'sdl' 'libxmu' 'libxi' 'libgl' 'libtiff' \ +depends=('glew' 'devil' 'libboost>=1.50.0' 'sdl' 'libxmu' 'libxi' 'libgl' 'libtiff' \ 'libjpeg>=8a' 'libsm' 'libxcb' 'libxdamage' 'e2fsprogs' 'openal>=1.15.1' \ 'libvorbis' 'freetype2' 'libxcursor' 'libglu') -makedepends=('xz>=5.0.3' 'boost' '7zip') +makedepends=('xz>=5.0.3' 'boost>=1.50.0' '7zip') _F_sourceforge_ext="_src.tar.gz" _F_sourceforge_dirname="springrts" _F_sourceforge_sep="_" @@ -19,10 +19,11 @@ _F_cmake_confopts="-DCMAKE_INSTALL_PREFIX=/usr -DDATADIR=share/spring -DUSE_GML_ Finclude sourceforge cmake groups=('games-extra') archs=('i686' 'x86_64') -source=(${source[@]} $pkgname-gcc-4.6.patch \ +source=(${source[@]} $pkgname-gcc-4.6.patch boost.patch \ http://spring2.admin-box.com/downloads/spring/spring-maps/DeltaSiegeDry.sd7) sha1sums=('cfa047eb7d92bb23517b2aab5b85578da1a542ae' \ '8e68c91d397940b3a373fdee61e0532f3a58aad6' \ + '4bb43a2217e7e3513b65c0b5f4d9fdc37591a743' \ 'd24892f8ad284a83b878612a3d3b20daf7e2b98a') @@ -31,8 +32,6 @@ build() # GCC 4.6 fix CXXFLAGS="$CXXFLAGS -fpermissive" - Fsed 'boost::TIME_UTC' 'TIME_UTC' rts/lib/headlessStubs/sdlstub_cppbit.cpp - Fsed 'boost::TIME_UTC' 'TIME_UTC' AI/Skirmish/E323AI/CScopedTimer.h Fsed 'NoDisplay=true' '#NoDisplay=true' cont/freedesktop/applications/spring.desktop CMake_build Fmkdir usr/share/spring/maps/ diff --git a/source/games-extra/spring/boost.patch b/source/games-extra/spring/boost.patch new file mode 100644 index 0000000..79fca6f --- /dev/null +++ b/source/games-extra/spring/boost.patch @@ -0,0 +1,15 @@ +diff -ur a/AI/Skirmish/E323AI/CScopedTimer.h b/AI/Skirmish/E323AI/CScopedTimer.h +--- a/AI/Skirmish/E323AI/CScopedTimer.h 2012-08-30 15:58:47.000000000 -0500 ++++ b/AI/Skirmish/E323AI/CScopedTimer.h 2012-12-31 10:58:36.846203068 -0600 +@@ -36,7 +36,11 @@ + + static unsigned int GetEngineRuntimeMSec() { + boost::xtime t; ++#if BOOST_VERSION >= 105000 ++ boost::xtime_get(&t, boost::TIME_UTC_); ++#else + boost::xtime_get(&t, boost::TIME_UTC); ++#endif + const unsigned int milliSeconds = t.sec * 1000 + (t.nsec / 1000000); + return milliSeconds; + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
