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

4 files changed, 13 insertions, 32 deletions

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 01993fa1cd87..9be9f8386326 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -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="
   ];
diff --git a/pkgs/development/libraries/openscenegraph/xine.patch b/pkgs/development/libraries/openscenegraph/xine.patch
deleted file mode 100644
index 8fbc8ceec52e..000000000000
--- a/pkgs/development/libraries/openscenegraph/xine.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
-@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- 	rgb_class->driver_class.get_identifier  = get_identifier;
- 	rgb_class->driver_class.get_description = get_description;
-+#else
-+	rgb_class->driver_class.identifier      = get_identifier(NULL);
-+	rgb_class->driver_class.description     = get_description(NULL);
-+#endif
-+
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
-
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 0fd3caffd5cc..df732c40f57e 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "simgear-${version}";
-  version = "3.0.0";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.tar.bz2";
-    sha256 = "1ssrcmvk3a4dv0k4vjzndmirwmdgzk689d7wpmjm423nydmwajh0";
+    sha256 = "152q3aqlrg3631ppvl6kr1mp5iszplq68l6lrsn9vjxafbz6czcj";
   };
 
   buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 31ae3aa3aa4a..58649f9220de 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -2,21 +2,21 @@
 , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
 , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
 , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
-, makeDesktopItem
+, makeDesktopItem, qt5
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.0";
+  version = "3.4.0";
   name = "flightgear-${version}";
 
   src = fetchurl {
-    url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2";
-    sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4";
+    url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${name}.tar.bz2";
+    sha256 = "102pg7mahgxzypvyp76x363qy3a4gxavr4hj16gsha07nl2msr5m";
   };
 
   datasrc = fetchurl {
     url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2";
-    sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4";
+    sha256 = "12qjvycizg693g5jj5qyp1jiwwywg6p9fg6j3zjxhx6r4g1sgvwc";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freeglut freealut mesa libICE libjpeg openal openscenegraph plib
     libSM libunwind libX11 xproto libXext xextproto libXi inputproto
-    libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr
+    libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5
   ];
 
   preConfigure = ''