MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

coin3d: 3.1.3 -> unstable-2019-06-12

Browse source
This commit is contained in:
Gabriel Ebner 2019-06-15 18:43:52 +02:00
parent b21ec0b9bf
commit 259eb2e966
3 changed files with 14 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/development/libraries/coin3d/default.nix
View file

@ -1,30 +1,25 @@
{ fetchurl, stdenv, libGLU_combined }:
{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
stdenv.mkDerivation rec {
name = "coin3d-${version}";
version = "3.1.3";
pname = "coin";
version = "unstable-2019-06-12";
src = fetchurl {
url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz";
sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
src = fetchFromBitbucket {
owner = "Coin3D";
repo = "coin";
rev = "8d860d7ba112b22c4e9b289268fd8b3625ab81d3";
sha256 = "1cpncljqvw28k5wvpgchv593nayhby5gwpvbnyllc9hb9ms816xn";
};
patches = [
(fetchurl {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch;
name = "gcc-4.7.patch";
sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
})
./gcc-4.8.patch # taken from FC-17 source rpm
# see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate
# patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff
./sbhashentry.patch
];
postPatch = ''
sed -i /cpack.d/d CMakeLists.txt
'';
buildInputs = [ libGLU_combined ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost libGLU_combined ];
meta = {
homepage = http://www.coin3d.org/;
homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
license = stdenv.lib.licenses.gpl2Plus;
description = "High-level, retained-mode toolkit for effective 3D graphics development";
maintainers = [ stdenv.lib.maintainers.viric ];

38
pkgs/development/libraries/coin3d/gcc-4.8.patch
View file

@ -1,38 +0,0 @@
From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
Date: Thu, 18 Apr 2013 19:17:06 +0200
Subject: [PATCH 10/10] GCC-4.8.0 fixes
---
src/fonts/freetype.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp
index 760b88b..e705d3a 100644
--- a/src/fonts/freetype.cpp
+++ b/src/fonts/freetype.cpp
@@ -32,18 +32,18 @@
20050613 mortene. */
-#include "fonts/freetype.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <stdlib.h>
+#include <cstdlib>
#include <assert.h>
#include "glue/freetype.h"
#include "glue/GLUWrapper.h"
+#include "fonts/freetype.h"
+
/* ************************************************************************* */
#ifdef __cplusplus
--
1.8.1.4

25
pkgs/development/libraries/coin3d/sbhashentry.patch
View file

@ -1,25 +0,0 @@
diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\<buffer\ SbHash.h\> /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0
--- a/src/misc/SbHash.h
+++ b/src/misc/SbHash.h
@@ -88,8 +88,8 @@
SbHashEntry<Type, Key> * entry = static_cast<SbHashEntry<Type, Key> *>( ptr);
cc_memalloc_deallocate(entry->memhandler, ptr);
}
- SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-
+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
+ : key(key), obj(obj), memhandler(memhandler) {}
Key key;
Type obj;
SbHashEntry<Type, Key> * next;
@@ -218,7 +218,7 @@
/* Key not already in the hash table; insert a new
* entry as the first element in the bucket
*/
- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
entry->next = this->buckets[i];
this->buckets[i] = entry;
Diff finished. Sat Sep 9 19:50:32 2017