Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sc8-pr-cvs17:/tmp/cvs-serv17666
Modified Files:
glob2.info
Added Files:
glob2.patch
Log Message:
Update from tracker
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=1794510&group_id=17203
--- NEW FILE: glob2.patch ---
--- glob2-0.9.1/SConstruct~ 2007-09-10 00:17:39.000000000 +0200
+++ glob2-0.9.1/SConstruct 2007-09-14 03:23:22.000000000 +0200
@@ -4,12 +4,19 @@
opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "")
opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share")
opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin")
+ opts.Add("DATADIR", "Final destination of data files", "/usr/local/share")
+ opts.Add("FINKPREFIX", "Fink directory", "/sw")
opts.Add(BoolOption("release", "Build for release", 0))
opts.Add(BoolOption("mingw", "Build with mingw enabled if not
auto-detected", 0))
opts.Add(BoolOption("osx", "Build for OSX", 0))
Help(opts.GenerateHelpText(env))
opts.Update(env)
opts.Save('options_cache.py', env)
+
+ env.Append(CPPPATH = [ env["FINKPREFIX"] + "/include" ])
+ env.Append(CPPPATH = [ "/usr/X11R6/include" ])
+ env.Append(LIBPATH = [ env["FINKPREFIX"] + "/lib"])
+ env.Append(LIBPATH = [ "/usr/X11R6/lib" ])
class Configuration:
@@ -29,7 +36,7 @@
configfile = Configuration()
configfile.add("PACKAGE", "Name of package", "\"glob2\"")
configfile.add("PACKAGE_BUGREPORT", "Define to the address where bug
reports for this package should be sent.", "\"[EMAIL PROTECTED]"")
- configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" +
env["INSTALLDIR"] + "\"")
+ configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"]
+ "\"")
configfile.add("PACKAGE_SOURCE_DIR", "source directory", "\""
+env.Dir("#").abspath.replace("\\", "\\\\") + "\"")
configfile.add("PACKAGE_NAME", "Define to the full name of this package.",
"\"Globulation 2\"")
configfile.add("PACKAGE_TARNAME", "Define to the one symbol short name of
this package.", "\"glob2\"")
@@ -94,10 +101,8 @@
elif conf.CheckLib('opengl32') and conf.CheckCHeader('GL/gl.h'):
gl_libraries.append("opengl32")
else:
- #Quick fix for OSX, ignore libraries not found
- if not env['osx']:
- print "Could not find libGL or opengl32, or could not find GL/gl.h
or OpenGL/gl.h"
- Exit(1)
+ print "Could not find libGL or opengl32, or could not find GL/gl.h or
OpenGL/gl.h"
+ Exit(1)
#Do checks for GLU, which is different on every system
if conf.CheckLib('GLU') and conf.CheckCHeader("GL/glu.h"):
@@ -147,8 +152,6 @@
else:
env.ParseConfig("sdl-config --cflags")
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["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] +
".tar.gz"
Index: glob2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/glob2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glob2.info 15 Sep 2007 00:40:25 -0000 1.2
+++ glob2.info 11 Oct 2007 00:40:55 -0000 1.3
@@ -1,23 +1,23 @@
Package: glob2
-Version: 0.8.23
-Revision: 3
+Version: 0.9.1
+Revision: 2
GCC: 4.0
Architecture: powerpc, i386
Maintainer: Alexandre Vial <[EMAIL PROTECTED]>
-Depends: libvorbis0-shlibs, sdl-image-shlibs, sdl-ttf-shlibs, sdl-net-shlibs,
speex3-shlibs, boost1.34.nopython-shlibs, fribidi-shlibs
-BuildDepends: vorbis-tools, libvorbis0, libogg, sdl, sdl-image, sdl-ttf,
sdl-net, speex3, boost1.34.nopython, fribidi, fribidi-dev
+Depends: libvorbis0-shlibs, sdl-image-shlibs, sdl-ttf-shlibs, sdl-net-shlibs,
speex3-shlibs, boost1.34.nopython-shlibs, fribidi-shlibs, x11-shlibs
+BuildDepends: scons, vorbis-tools, libvorbis0, libogg, sdl, sdl-image,
sdl-ttf, sdl-net, speex3, boost1.34.nopython, fribidi, fribidi-dev, x11-dev
Conflicts:
Source: http://dl.sv.nongnu.org/releases/%n/%v/%n-%v.tar.gz
-Source-MD5: d8807da21fc32db1727dd62b8d5c786a
+Source-MD5: 507da29c310f199f9b1a9a5f335b7a7a
SourceDirectory: glob2-%v
-Patch:
-UpdateConfigGuess: true
-SetLDFLAGS:
-ConfigureParams: --disable-dependency-tracking --disable-sdltest
+Patch: %n.patch
+CompileScript: <<
+ scons osx=1 release=1 INSTALLDIR=%i/share BINDIR=%i/bin
DATADIR=%p/share/glob2 FINKPREFIX=%p
+<<
InstallScript: <<
-make install DESTDIR=%d
+ scons install
<<
-DocFiles: AUTHORS COPYING README NEWS TODO INSTALL
+DocFiles: AUTHORS COPYING README README.hg TODO INSTALL
InfoDocs:
Description: Innovative Real-Time Strategy (RTS) game
DescDetail: <<
@@ -30,8 +30,10 @@
tutorials and an integrated map editor. Globulation2 can be played in single
player mode, through your local network, or over the Internet with
Ysagoon Online Gaming (or YOG for short).
+To play, type glob2 in Terminal.app.
<<
DescPort: <<
+Scons does not find some files when checking, but compiling is ok, so exit
lines are commented.
<<
Homepage: http://www.globulation2.org/
License: GPL
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
