flightgear: bump version to 3.4 (close #6385)
- openscenegraph: bump version to 3.2.1: http://www.openscenegraph.org/index.php/download-section/stable-releases - remove obsolete patch - simgear: bump version to 3.4.0 - flightgear: add qt5 as build input
This commit is contained in:
committed by
Vladimír Čunát
parent
22625fbf37
commit
30beb0ad7d
@@ -2,7 +2,8 @@ x@{builderDefsPackage
|
||||
, cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
|
||||
, coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
|
||||
, doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
|
||||
, curl, a52dec, faad2, gdk_pixbuf
|
||||
, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
|
||||
, qt4, poppler, librsvg, gtk
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
@@ -14,10 +15,10 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="OpenSceneGraph";
|
||||
version="3.0.1";
|
||||
version="3.2.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip";
|
||||
hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c";
|
||||
url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip";
|
||||
hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
@@ -32,8 +33,6 @@ rec {
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
|
||||
|
||||
patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659
|
||||
|
||||
cmakeFlags = [
|
||||
"-D MATH_LIBRARY="
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user