#4301 Update of autotrace 0.31.1 to use imagemagick5

Added_to_Fink
closed-fixed
nobody
None
5
5 days ago
2013-06-27
Peter Dyballa
No

Tested with 'fink -vmk --build-as-nobody --tests=on --validate=on rebuild autotrace-shlibs autotrace-bin autotrace' on Mac OS X 10.6.8 and PPC/G4 Mac OS X 10.5.8 on HFS and HFSX file systems. Parallel builds succeed.

pete 392 /\ dpkg -L autotrace autotrace-shlibs autotrace-bin
/.
/sw
/sw/bin
/sw/bin/autotrace-config
/sw/include
/sw/include/autotrace
/sw/include/autotrace/autotrace.h
/sw/include/autotrace/exception.h
/sw/include/autotrace/input.h
/sw/include/autotrace/output.h
/sw/include/autotrace/types.h
/sw/lib
/sw/lib/libautotrace.la
/sw/lib/pkgconfig
/sw/lib/pkgconfig/autotrace.pc
/sw/share
/sw/share/aclocal
/sw/share/aclocal/autotrace.m4
/sw/share/doc
/sw/share/doc/autotrace
/sw/share/doc/autotrace/AUTHORS
/sw/share/doc/autotrace/COPYING
/sw/share/doc/autotrace/COPYING.LIB
/sw/share/doc/autotrace/ChangeLog
/sw/share/doc/autotrace/FAQ
/sw/share/doc/autotrace/HACKING
/sw/share/doc/autotrace/NEWS
/sw/share/doc/autotrace/README
/sw/share/doc/autotrace/README.MING
/sw/share/doc/autotrace/THANKS
/sw/share/doc/autotrace/TODO
/sw/lib/libautotrace.dylib

/.
/sw
/sw/lib
/sw/lib/libautotrace.3.dylib
/sw/share
/sw/share/doc
/sw/share/doc/autotrace-shlibs
/sw/share/doc/autotrace-shlibs/AUTHORS
/sw/share/doc/autotrace-shlibs/COPYING
/sw/share/doc/autotrace-shlibs/COPYING.LIB
/sw/share/doc/autotrace-shlibs/ChangeLog
/sw/share/doc/autotrace-shlibs/FAQ
/sw/share/doc/autotrace-shlibs/HACKING
/sw/share/doc/autotrace-shlibs/NEWS
/sw/share/doc/autotrace-shlibs/README
/sw/share/doc/autotrace-shlibs/README.MING
/sw/share/doc/autotrace-shlibs/THANKS
/sw/share/doc/autotrace-shlibs/TODO

/.
/sw
/sw/bin
/sw/bin/autotrace
/sw/share
/sw/share/doc
/sw/share/doc/autotrace-bin
/sw/share/doc/autotrace-bin/AUTHORS
/sw/share/doc/autotrace-bin/COPYING
/sw/share/doc/autotrace-bin/COPYING.LIB
/sw/share/doc/autotrace-bin/ChangeLog
/sw/share/doc/autotrace-bin/FAQ
/sw/share/doc/autotrace-bin/HACKING
/sw/share/doc/autotrace-bin/NEWS
/sw/share/doc/autotrace-bin/README
/sw/share/doc/autotrace-bin/README.MING
/sw/share/doc/autotrace-bin/THANKS
/sw/share/doc/autotrace-bin/TODO
/sw/share/man
/sw/share/man/man1
/sw/share/man/man1/autotrace.1

1 Attachments

Related

Package Submissions: #4185

Discussion

  • Peter Dyballa
    Peter Dyballa
    2013-06-27

    It's still the same as before.

     
    Attachments
  • You can get rid of the BuildConflicts line completely.

    There is no normal way currently that you can install libpng15 or libpng16 with libpng14 installed, and similarly you can't install automake1.12 or automake1.13 with automake1.11 installed.

     
    • Peter Dyballa
      Peter Dyballa
      2013-06-28

      OK! Next update here!

       
      Attachments
  • I'm attaching a .info/.patch combo that fixes your submission to work with libpng16. I was able to build this in 10.7, 10.6/i386 and 10.6/x86_64 (using imagemagick7 in 10.7, and imagemagick5 in 10.6 to match pstoedit). The only other change from your submission besides imagemagick/libpng bumps is to increase automake to 1.13 and move configure.in to configure.ac to remove a warning when autoreconf is run. Ran a quick test on 10.7 and it converted a BMP file to svg and eps. Let us know if it runs on < 10.7

    This is the patch to fix the build with newer libpng

    --- autotrace-0.31.1.orig/input-png.c 2002-10-10 20:44:14.000000000 +0000
    +++ autotrace-0.31.1/input-png.c    2013-11-01 09:25:15.000000000 -0400
    @@ -42,17 +42,17 @@
    
     static void handle_warning(png_structp png, const at_string message) {
             LOG1("PNG warning: %s", message);
    -   at_exception_warning((at_exception_type *)png->error_ptr,
    +   at_exception_warning((at_exception_type *)png_get_error_ptr(png),
                     message);
    -   /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
    +   /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
           "PNG warning"); */
     }
    
     static void handle_error(png_structp png, const at_string message) {
        LOG1("PNG error: %s", message);
    -   at_exception_fatal((at_exception_type *)png->error_ptr,
    +   at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
                   message);
    -   /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
    +   /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
           "PNG error"); */
    
     }
    @@ -157,8 +157,8 @@
    
        png_set_strip_16(png_ptr);
        png_set_packing(png_ptr);
    -   if ((png_ptr->bit_depth < 8) ||
    -       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
    +   if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
    +       (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
            (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
            png_set_expand(png_ptr);
    
    @@ -181,20 +181,10 @@
                       PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
        } else
            png_set_strip_alpha(png_ptr);
    +   png_set_interlace_handling(png_ptr);
        png_read_update_info(png_ptr, info_ptr);
    
    -
    -   info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
    -                           info_ptr->height * sizeof(png_bytep));
    -#ifdef PNG_FREE_ME_SUPPORTED
    -   info_ptr->free_me |= PNG_FREE_ROWS;
    -#endif
    -   for (row = 0; row < (int)info_ptr->height; row++)
    -       info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
    -                                   png_get_rowbytes(png_ptr, info_ptr));
    -   
    -   png_read_image(png_ptr, info_ptr->row_pointers);
    -   info_ptr->valid |= PNG_INFO_IDAT;
    +   png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
        png_read_end(png_ptr, info_ptr);
        return png_get_rows(png_ptr, info_ptr);
     }
    
     
    • Peter Dyballa
      Peter Dyballa
      2013-11-01

      On 10.5.8 with automake 1.13 it fails near the beginning:

      + mv configure.in configure.ac
      + autoreconf -f -i
      configure.ac:37: error: 'AM_CONFIG_HEADER': this macro is obsolete.
          You should use the 'AC_CONFIG_HEADERS' macro instead.
      /sw/share/aclocal-1.13/obsolete-err.m4:12: AM_CONFIG_HEADER is expanded from...
      configure.ac:37: the top level
      autom4te-2.69: /sw/bin/m4 failed with exit status: 1
      
       
    • Peter Dyballa
      Peter Dyballa
      2013-11-01

      On 10.6.8 built OK. Fine to release IMO.

       
    • Group: Undergoing_Validation --> Awaiting_Update_from_Submitter
     
    • status: open --> closed-fixed
    • Group: Awaiting_Update_from_Submitter --> Added_to_Fink
     
  • This is now live in the 10.7+ and 10.6 distributions. It got missed in my previous sweep of tracker items awaiting action. Sorry about the delay and thanks for working with this.