swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix K3D patching and cmake-configuration phases

Browse source
This commit is contained in:
Michael Raskin 2014-08-30 23:48:58 +04:00
parent b8fca7b38c
commit d593d3ac88
3 changed files with 2 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/graphics/k3d/default.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchurl
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm, glibmm, gtkglext
, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat
}:
stdenv.mkDerivation rec {
@ -13,11 +13,7 @@ stdenv.mkDerivation rec {
};
patches = [
# debian package source
./disable_mutable_in_boost_gil.patch
./k3d_gtkmm224.patch
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
./k3d-0.7.11.0-libpng14.patch
];
preConfigure = ''
@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
intltool perl
gtkmm glibmm gtkglext
gtkmm glibmm gtkglext pangox_compat
];
doCheck = false;

20
pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch
View file

@ -1,20 +0,0 @@
--- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
+++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
@@ -114,7 +114,7 @@
template <typename T2, typename Op>
struct reduce_bind1 {
const T2& _t2;
- mutable Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;
@@ -127,7 +127,7 @@
struct reduce_bind2 {
const Bits1& _bits1;
std::size_t _index1;
- mutable Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;

54
pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch
View file

@ -1,54 +0,0 @@
diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200
+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300
@@ -148,12 +148,12 @@
// allocate/initialize the image information data
_info_ptr = png_create_info_struct(_png_ptr);
if (_info_ptr == NULL) {
- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr,NULL,NULL);
io_error("png_get_file_size: fail to call png_create_info_struct()");
}
if (setjmp(png_jmpbuf(_png_ptr))) {
//free all of the memory associated with the png_ptr and info_ptr
- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
io_error("png_get_file_size: fail to call setjmp()");
}
png_init_io(_png_ptr, get());
@@ -165,7 +165,7 @@
png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
~png_reader() {
- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
}
point2<std::ptrdiff_t> get_dimensions() {
return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
@@ -177,7 +177,7 @@
int bit_depth, color_type, interlace_type;
png_get_IHDR(_png_ptr, _info_ptr,
&width, &height,&bit_depth,&color_type,&interlace_type,
- int_p_NULL, int_p_NULL);
+ (int *) NULL, (int *) NULL);
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
"png_read_view: input view size does not match PNG file size");
@@ -219,7 +219,7 @@
int bit_depth, color_type, interlace_type;
png_get_IHDR(_png_ptr, _info_ptr,
&width, &height,&bit_depth,&color_type,&interlace_type,
- int_p_NULL, int_p_NULL);
+ (int *) NULL, (int *) NULL);
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
"png_reader_color_convert::apply(): input view size does not match PNG file size");
switch (color_type) {
@@ -308,7 +308,7 @@
io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
_info_ptr = png_create_info_struct(_png_ptr);
if (!_info_ptr) {
- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
+ png_destroy_write_struct(&_png_ptr,NULL);
io_error("png_write_initialize: fail to call png_create_info_struct()");
}
if (setjmp(png_jmpbuf(_png_ptr))) {