public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flightgear: bump version to 3.4 (close #6385)

Browse Source 
- 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:
Longrin Wischnewski
2015-02-17 07:50:11 +01:00
committed by Vladimír Čunát
parent 22625fbf37
commit 30beb0ad7d
4 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/openscenegraph/default.nix
View File

@@ -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="
];

18
pkgs/development/libraries/openscenegraph/xine.patch
View File

@@ -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);