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

openscenegraph: update and fix

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-23 20:09:11 +01:00
parent 0eeae100fd
commit 5e8747300e
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,22 +2,22 @@ x@{builderDefsPackage
, cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
, coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
, doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
, curl , curl, a52dec, faad2, gdk_pixbuf
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="OpenSceneGraph"; baseName="OpenSceneGraph";
version="2.8.3"; version="3.0.1";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip"; url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip";
hash="0phihxs7zgir9n1z54xsrsha8wa0xll7xl6lvqvrrczf0bm80yrs"; hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c";
}; };
in in
rec { rec {
@ -30,7 +30,9 @@ rec {
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["setVars" "addInputs" "doUnpack" "doCmake" "doMakeInstall"]; phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659
cmakeFlags = [ cmakeFlags = [
"-D MATH_LIBRARY=" "-D MATH_LIBRARY="
@ -39,7 +41,7 @@ rec {
setVars = a.noDepEntry '' setVars = a.noDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
''; '';
meta = { meta = {
description = "A 3D graphics toolkit"; description = "A 3D graphics toolkit";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;

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

@ -0,0 +1,18 @@
--- 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);