Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=887832b9a36de775387e92a4eaa10d9361aeb44d
commit 887832b9a36de775387e92a4eaa10d9361aeb44d Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Feb 1 23:29:37 2010 +0100 flightgear-1.9.1-3-i686 - drop fgfs-base dependency, it's nobuild - add README.Frugalware to explain the situation - add patch to make parallel build possible - add patch to build with gcc-4.4 diff --git a/source/games-extra/flightgear/FrugalBuild b/source/games-extra/flightgear/FrugalBuild index ce654a0..b42246e 100644 --- a/source/games-extra/flightgear/FrugalBuild +++ b/source/games-extra/flightgear/FrugalBuild @@ -3,21 +3,24 @@ pkgname=flightgear pkgver=1.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source, multi-platform flight simulator." url="http://www.flightgear.org/"; -depends=('libgl' 'zlib' 'freealut>=1.1.0-3' 'freeglut' 'fgfs-base' 'plib' 'libboost-mt>=1.37.0' 'openscenegraph>=2.8.0') +depends=('libgl' 'zlib' 'freealut>=1.1.0-3' 'freeglut' 'plib' 'libboost-mt>=1.37.0' 'openscenegraph>=2.8.0') makedepends=('simgear>=1.9.1-4' 'boost>=1.37.0') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/Downloads/source.shtml|grep 'Release: Version \([0-9\.]*\) ('|sed 's/.*n \(.*\) (.*/\1/;q'" -source=(http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz) -sha1sums=('db1a6478164eabaab7c5ecf05bb011b573bb8659') +source=(http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz \ + flightgear-1.9.1-gcc44.patch flightgear-1.9.1-parallel.patch) +sha1sums=('db1a6478164eabaab7c5ecf05bb011b573bb8659' \ + '2283d4b702566e50f5660ed03c8cb1eeac09cae8' \ + '0d4a70faa9b80a620b6c49295d288ad861b48cfe') build() { - unset MAKEFLAGS Fcd FlightGear-$pkgver + Fpatchall Fmake --with-threads Fmakeinstall } diff --git a/source/games-extra/flightgear/README.Frugalware b/source/games-extra/flightgear/README.Frugalware new file mode 100644 index 0000000..d76baa1 --- /dev/null +++ b/source/games-extra/flightgear/README.Frugalware @@ -0,0 +1,3 @@ +You probably want to run `repoman merge fgfs-base` after installing this +package, as that package provides textures, models, data, aircraft, +sample scenery, and configs files for FlightGear. diff --git a/source/games-extra/flightgear/flightgear-1.9.1-gcc44.patch b/source/games-extra/flightgear/flightgear-1.9.1-gcc44.patch new file mode 100644 index 0000000..778ffe5 --- /dev/null +++ b/source/games-extra/flightgear/flightgear-1.9.1-gcc44.patch @@ -0,0 +1,10 @@ +--- utils/GPSsmooth/UGear_command.cxx.old 2009-05-22 08:46:02.000000000 +0200 ++++ utils/GPSsmooth/UGear_command.cxx 2009-05-22 08:46:58.000000000 +0200 +@@ -1,6 +1,7 @@ + #include <cstring> + + #include "UGear_command.hxx" ++#include <cstdio> + + + UGCommand::UGCommand(): diff --git a/source/games-extra/flightgear/flightgear-1.9.1-parallel.patch b/source/games-extra/flightgear/flightgear-1.9.1-parallel.patch new file mode 100644 index 0000000..6114747 --- /dev/null +++ b/source/games-extra/flightgear/flightgear-1.9.1-parallel.patch @@ -0,0 +1,11 @@ +--- src/Main/Makefile.am.old 2009-03-05 16:57:02.000000000 +0100 ++++ src/Main/Makefile.am 2009-03-05 16:57:26.000000000 +0100 +@@ -61,7 +61,7 @@ + fgfs_SOURCES = bootstrap.cxx + + fgfs_LDADD = \ +- $(top_builddir)/src/Main/libMain.a \ ++ libMain.a \ + $(top_builddir)/src/Aircraft/libAircraft.a \ + $(top_builddir)/src/ATCDCL/libATCDCL.a \ + $(top_builddir)/src/Cockpit/libCockpit.a \ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
