pyrox.dev
openscenegraph: update and fix
+9
-7
pkgs/development/libraries/openscenegraph/default.nix
+9
-7
pkgs/development/libraries/openscenegraph/default.nix
···
2
, cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
3
, coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
4
, doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
5
-
, curl
6
, ...}:
7
builderDefsPackage
8
(a :
9
-
let
10
-
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
11
[];
12
13
buildInputs = map (n: builtins.getAttr n x)
14
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
15
sourceInfo = rec {
16
baseName="OpenSceneGraph";
17
-
version="2.8.3";
18
name="${baseName}-${version}";
19
url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip";
20
-
hash="0phihxs7zgir9n1z54xsrsha8wa0xll7xl6lvqvrrczf0bm80yrs";
21
};
22
in
23
rec {
···
30
inherit buildInputs;
31
32
/* doConfigure should be removed if not needed */
33
-
phaseNames = ["setVars" "addInputs" "doUnpack" "doCmake" "doMakeInstall"];
34
35
cmakeFlags = [
36
"-D MATH_LIBRARY="
···
39
setVars = a.noDepEntry ''
40
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
41
'';
42
-
43
meta = {
44
description = "A 3D graphics toolkit";
45
maintainers = with a.lib.maintainers;
···
2
, cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
3
, coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
4
, doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
5
+
, curl, a52dec, faad2, gdk_pixbuf
6
, ...}:
7
builderDefsPackage
8
(a :
9
+
let
10
+
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
11
[];
12
13
buildInputs = map (n: builtins.getAttr n x)
14
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
15
sourceInfo = rec {
16
baseName="OpenSceneGraph";
17
+
version="3.0.1";
18
name="${baseName}-${version}";
19
url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip";
20
+
hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c";
21
};
22
in
23
rec {
···
30
inherit buildInputs;
31
32
/* doConfigure should be removed if not needed */
33
+
phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
34
+
35
+
patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659
36
37
cmakeFlags = [
38
"-D MATH_LIBRARY="
···
41
setVars = a.noDepEntry ''
42
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
43
'';
44
+
45
meta = {
46
description = "A 3D graphics toolkit";
47
maintainers = with a.lib.maintainers;
+18
pkgs/development/libraries/openscenegraph/xine.patch
+18
pkgs/development/libraries/openscenegraph/xine.patch
···
···
1
+
--- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c
2
+
+++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
3
+
@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
4
+
clear(rgb_class, sizeof(rgbout_class_t));
5
+
6
+
rgb_class->driver_class.open_plugin = open_plugin;
7
+
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
8
+
rgb_class->driver_class.get_identifier = get_identifier;
9
+
rgb_class->driver_class.get_description = get_description;
10
+
+#else
11
+
+ rgb_class->driver_class.identifier = get_identifier(NULL);
12
+
+ rgb_class->driver_class.description = get_description(NULL);
13
+
+#endif
14
+
+
15
+
rgb_class->driver_class.dispose = dispose_class;
16
+
17
+
return(rgb_class);
18
+