Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0ec26a6532ea8878996767729d6d1639bf2eee8

commit f0ec26a6532ea8878996767729d6d1639bf2eee8
Author: VMiklos <[EMAIL PROTECTED]>
Date:   Thu Sep 6 22:41:14 2007 +0200

glob2-0.9.1-1-i686
version bump
added -boostmt.diff to build with our mt boost
added missing desktop file

diff --git a/source/games-extra/glob2/FrugalBuild 
b/source/games-extra/glob2/FrugalBuild
index c4ffe85..f42b186 100644
--- a/source/games-extra/glob2/FrugalBuild
+++ b/source/games-extra/glob2/FrugalBuild
@@ -3,22 +3,26 @@
# Contributor: Mcklaren  <[EMAIL PROTECTED]>

pkgname=glob2
-pkgver=0.8.23
-pkgrel=2
+pkgver=0.9.1
+pkgrel=1
pkgdesc="Innovative Real-Time Strategy (RTS) game which reduces 
micro-management by automatically assigning tasks to units."
url="http://globulation2.org/";
depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex')
-makedepends=('boost>=1.34.0')
+makedepends=('boost>=1.34.0' 'scons')
license="GPL2"
groups=('games-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump 
http://globulation2.org/wiki/Download_and_Install#Source_Distribution|grep 
'Source code'|sed -n 's/.*-\(.*\).t.*/\1/;1 p'"
-source=("http://dl.sv.nongnu.org/releases/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";)
+source=("http://dl.sv.nongnu.org/releases/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz";
 glob2-0.9.1-boostmt.diff glob2.desktop)

build() {
-       Fsed "CXXFLAGS=\"-O3 -march=i686\"" "" configure
-       Fbuild
+       Fpatchall
+       cp $Fsrcdir/glob2.desktop data/ || return 1
+       scons || return 1
+       scons BINDIR="$Fdestdir/usr/bin" INSTALLDIR="$Fdestdir/usr/share" 
install || return 1
}

-sha1sums=('910a6a4af7ff21e768aa525cda61cbd7ae675a7b')
+sha1sums=('18136ff058e2b7bd313cefdc45bcbfe25e12a5e0' \
+          '14373039ae35116b9bec89604240aab0202d1d99' \
+          'f65660dafea34ca84a53cb8033f856baac65fd84')
# optimization OK
diff --git a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff 
b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
new file mode 100644
index 0000000..8476984
--- /dev/null
+++ b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff
@@ -0,0 +1,22 @@
+--- glob2-0.9.1/SConstruct.orig        2007-09-06 18:01:34.000000000 +0200
++++ glob2-0.9.1/SConstruct     2007-09-06 18:03:00.000000000 +0200
+@@ -66,8 +66,8 @@
+         else:
+             print "Coulf not find libz or zlib1.dll"
+             Exit(1)
+-    if not conf.CheckLib('boost_thread') or not 
conf.CheckCXXHeader('boost/thread/thread.hpp'):
+-        print "Could not find libboost_thread or boost/thread/thread.hpp"
++    if not conf.CheckLib('boost_thread-gcc42-mt') or not 
conf.CheckCXXHeader('boost/thread/thread.hpp'):
++        print "Could not find libboost_thread-gcc42-mt or 
boost/thread/thread.hpp"
+         Exit(1)
+     if not conf.CheckCXXHeader('boost/shared_ptr.hpp'):
+         print "Could not find boost/shared_ptr.hpp"
+@@ -149,7 +149,7 @@
+         env.ParseConfig("sdl-config --libs")
+     if env['osx']:
+         env.Append(CXXFLAGS="-framework OpenGL")
+-    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 
'speex', 'boost_thread'])
++    env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 
'speex', 'boost_thread-gcc42-mt'])
+
+     env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + 
".tar.gz"
+     env["TARFLAGS"] = "-c -z"
diff --git a/source/games-extra/glob2/glob2.desktop 
b/source/games-extra/glob2/glob2.desktop
new file mode 100644
index 0000000..bb87b9c
--- /dev/null
+++ b/source/games-extra/glob2/glob2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Globulation 2
+Comment=An innovative new strategy game
+Exec=glob2
+Icon=glob2-icon-48x48
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Categories=Application;Game;StrategyGame;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to