Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=6065849fb288181b59839c23a2edc743f7c1658f
commit 6065849fb288181b59839c23a2edc743f7c1658f Author: James Buren <[email protected]> Date: Thu Nov 29 03:07:25 2012 -0600 spring-91.0-2-x86_64 * rebuild with libboost diff --git a/source/games-extra/spring/FrugalBuild b/source/games-extra/spring/FrugalBuild index 87cc68c..7249896 100644 --- a/source/games-extra/spring/FrugalBuild +++ b/source/games-extra/spring/FrugalBuild @@ -3,9 +3,9 @@ pkgname=spring pkgver=91.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free 3D game engine for the real-time-strategy (RTS) game Total Annihilation" -depends=('glew' 'devil' 'libboost>=1.49.0' 'sdl' 'libxmu' 'libxi' 'libgl' 'libtiff' 'libjpeg>=8a' \ +depends=('glew' 'devil' 'libboost>=1.51.0' 'sdl' 'libxmu' 'libxi' 'libgl' 'libtiff' 'libjpeg>=8a' \ 'libsm' 'libxcb' 'libxdamage' 'e2fsprogs' 'openal' 'libvorbis' 'freetype2' 'libxcursor' 'openal' 'libglu') makedepends=('xz>=5.0.3' 'boost' '7zip') _F_sourceforge_ext="_src.tar.gz" @@ -18,10 +18,11 @@ archs=('i686' 'x86_64') _F_cd_path="${pkgname}_${pkgver}" _F_cmake_confopts="-DCMAKE_INSTALL_PREFIX=/usr -DDATADIR=share/spring -DUSE_GML_SIM=ON -DUSE_GML=ON" Finclude cmake -source=(${source[@]} README.Frugalware $pkgname-gcc-4.6.patch) +source=(${source[@]} README.Frugalware $pkgname-gcc-4.6.patch boost.patch) sha1sums=('cfa047eb7d92bb23517b2aab5b85578da1a542ae' \ '5721b8c82c14fbfc895f86cbfbd7a1b00dcbc894' \ - '8e68c91d397940b3a373fdee61e0532f3a58aad6') + '8e68c91d397940b3a373fdee61e0532f3a58aad6' \ + '9bcbd40aa5007be51680fa4d202d1a98474fcef2') # GCC 4.6 fix CXXFLAGS="$CXXFLAGS -fpermissive" diff --git a/source/games-extra/spring/boost.patch b/source/games-extra/spring/boost.patch new file mode 100644 index 0000000..90b6161 --- /dev/null +++ b/source/games-extra/spring/boost.patch @@ -0,0 +1,12 @@ +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-11-29 02:53:33.302529740 -0600 +@@ -36,7 +36,7 @@ + + static unsigned int GetEngineRuntimeMSec() { + boost::xtime t; +- boost::xtime_get(&t, boost::TIME_UTC); ++ boost::xtime_get(&t, boost::TIME_UTC_); + 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
