Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=9c5a24922b941aacfbf9ade197493abae1197399
commit 9c5a24922b941aacfbf9ade197493abae1197399 Author: James Buren <[email protected]> Date: Fri Nov 30 00:30:20 2012 -0600 gigi-1074-3-x86_64 * rebuild with libboost diff --git a/source/xlib-extra/gigi/FrugalBuild b/source/xlib-extra/gigi/FrugalBuild index 642c07d..7e027ad 100644 --- a/source/xlib-extra/gigi/FrugalBuild +++ b/source/xlib-extra/gigi/FrugalBuild @@ -3,17 +3,19 @@ pkgname=gigi pkgver=1074 -pkgrel=2 +pkgrel=3 pkgdesc="GiGi is a small, efficient, and feature-rich C++ GUI for OpenGL" url="http://sourceforge.net/projects/gigi/"; -depends=('boost>=1.49' 'mesa' 'libpng>=1.4' 'libjpeg' 'libtiff' 'freetype2' 'ogre>=1.8.1' 'sdl>=1.2.7' 'ois') +depends=('mesa' 'libpng>=1.4' 'libjpeg' 'libtiff' 'freetype2' 'ogre>=1.8.1-2' 'sdl>=1.2.7' 'ois') +makedepends=('boost') groups=('xlib-extra') archs=('i686' 'x86_64') -source=(http://ftp.frugalware.org/pub/other/sources/freeorion/$pkgname-$pkgver.tar.xz) +source=(http://ftp.frugalware.org/pub/other/sources/freeorion/$pkgname-$pkgver.tar.xz boost.patch) up2date=$pkgver _F_cd_path="GG" Finclude cmake -sha1sums=('6f3b3ae0f52aefa57b6b3da22d37b267f5bec5dc') +sha1sums=('6f3b3ae0f52aefa57b6b3da22d37b267f5bec5dc' \ + 'a89543e6d29bd38c253a1cb78bc5c2a14d38b15b') build() { @@ -26,5 +28,3 @@ build() Ffilerel ../cmake/Config.cmake usr/lib/GiGi/cmake/Config.cmake Ffilerel ../cmake/Util.cmake usr/lib/GiGi/cmake/Util.cmake } - - diff --git a/source/xlib-extra/gigi/boost.patch b/source/xlib-extra/gigi/boost.patch new file mode 100644 index 0000000..15fcfc9 --- /dev/null +++ b/source/xlib-extra/gigi/boost.patch @@ -0,0 +1,12 @@ +diff -ur a/src/GUI.cpp b/src/GUI.cpp +--- a/src/GUI.cpp 2011-11-05 21:42:35.000000000 -0500 ++++ b/src/GUI.cpp 2012-11-30 00:20:30.516968696 -0600 +@@ -779,7 +779,7 @@ + void GUI::Wait(unsigned int ms) + { + boost::xtime t; +- boost::xtime_get(&t, boost::TIME_UTC); ++ boost::xtime_get(&t, boost::TIME_UTC_); + unsigned int ns_sum = t.nsec + ms * 1000000; + const unsigned int NANOSECONDS_PER_SECOND = 1000000000; + unsigned int delta_secs = ns_sum / NANOSECONDS_PER_SECOND; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
