commit 347dd52019d57ae15c25d56a36aa881c0badc05f · pyrox.dev/nixpkgs

+4 -1

pkgs/applications/graphics/k3d/default.nix

···

       14
       14
        
       

     

       15
       15
        
         patches = [

     

       16
       16
        
           ./k3d_gtkmm224.patch

     

       17
       17
       +
           ./libpng-1.4.patch

     

       17
       18
        
         ];

     

       18
       19
        
       

     

       19
       20
        
         preConfigure = ''

     
···

       28
       29
        
            gtkmm glibmm gtkglext pangox_compat libXmu

     

       29
       30
        
           ];

     

       30
       31
        
       

     

       31
       31
       -
         doCheck = false;

     

       32
       32
       +
         #doCheck = false;

     

       33
       33
       +
       

     

       34
       34
       +
         enableParallelBuilding = true;

     

       32
       35
        
       

     

       33
       36
        
         meta = {

     

       34
       37
        
           description = "A 3D editor with support for procedural editing";

+53

pkgs/applications/graphics/k3d/libpng-1.4.patch

···

       1
       1
       +
       --- k3d-source-0.8.0.1/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-04-18 13:49:33.000000000 +0800

     

       2
       2
       +
       +++ k3d-source-0.8.0.1-patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-06-10 21:17:51.555920268 +0800

     

       3
       3
       +
       @@ -148,12 +148,12 @@

     

       4
       4
       +
                // allocate/initialize the image information data

     

       5
       5
       +
                _info_ptr = png_create_info_struct(_png_ptr);

     

       6
       6
       +
                if (_info_ptr == NULL) {

     

       7
       7
       +
       -            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);

     

       8
       8
       +
       +			png_destroy_read_struct(&_png_ptr,NULL,NULL);

     

       9
       9
       +
                    io_error("png_get_file_size: fail to call png_create_info_struct()");

     

       10
       10
       +
                }

     

       11
       11
       +
                if (setjmp(png_jmpbuf(_png_ptr))) {

     

       12
       12
       +
                    //free all of the memory associated with the png_ptr and info_ptr

     

       13
       13
       +
       -            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);

     

       14
       14
       +
       +			png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);

     

       15
       15
       +
                    io_error("png_get_file_size: fail to call setjmp()");

     

       16
       16
       +
                }

     

       17
       17
       +
                png_init_io(_png_ptr, get());

     

       18
       18
       +
       @@ -165,7 +165,7 @@

     

       19
       19
       +
            png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }

     

       20
       20
       +
        

     

       21
       21
       +
            ~png_reader() {

     

       22
       22
       +
       -        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);

     

       23
       23
       +
       +		png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); 

     

       24
       24
       +
            }

     

       25
       25
       +
            point2<std::ptrdiff_t> get_dimensions() {

     

       26
       26
       +
                return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),

     

       27
       27
       +
       @@ -177,7 +177,7 @@

     

       28
       28
       +
                int bit_depth, color_type, interlace_type;

     

       29
       29
       +
                png_get_IHDR(_png_ptr, _info_ptr,

     

       30
       30
       +
                             &width, &height,&bit_depth,&color_type,&interlace_type,

     

       31
       31
       +
       -                     int_p_NULL, int_p_NULL);

     

       32
       32
       +
       +					 (int *) NULL, (int *) NULL);

     

       33
       33
       +
                io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),

     

       34
       34
       +
                            "png_read_view: input view size does not match PNG file size");

     

       35
       35
       +
                

     

       36
       36
       +
       @@ -219,7 +219,7 @@

     

       37
       37
       +
                int bit_depth, color_type, interlace_type;

     

       38
       38
       +
                png_get_IHDR(_png_ptr, _info_ptr,

     

       39
       39
       +
                             &width, &height,&bit_depth,&color_type,&interlace_type,

     

       40
       40
       +
       -                     int_p_NULL, int_p_NULL);

     

       41
       41
       +
       +					 (int *) NULL, (int *) NULL);

     

       42
       42
       +
                io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),

     

       43
       43
       +
                            "png_reader_color_convert::apply(): input view size does not match PNG file size");

     

       44
       44
       +
                switch (color_type) {

     

       45
       45
       +
       @@ -308,7 +308,7 @@

     

       46
       46
       +
                io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");

     

       47
       47
       +
                _info_ptr = png_create_info_struct(_png_ptr);

     

       48
       48
       +
                if (!_info_ptr) {

     

       49
       49
       +
       -            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);

     

       50
       50
       +
       +			png_destroy_write_struct(&_png_ptr,NULL);

     

       51
       51
       +
                    io_error("png_write_initialize: fail to call png_create_info_struct()");

     

       52
       52
       +
                }

     

       53
       53
       +
                if (setjmp(png_jmpbuf(_png_ptr))) {