Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31830
Modified Files:
etl.info synfig.info synfig.patch synfigstudio.info
Added Files:
etl.patch
Log Message:
etl 0.04.16 and synfig 0.64.0
--- NEW FILE: etl.patch ---
diff -ruN ETL-0.04.16-orig/test/Makefile.in ETL-0.04.16/test/Makefile.in
--- ETL-0.04.16-orig/test/Makefile.in 2013-05-09 12:32:44.000000000 -0400
+++ ETL-0.04.16/test/Makefile.in 2013-08-01 15:29:08.000000000 -0400
@@ -381,6 +381,10 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/value.Po@am__quote@
+fixed.o:
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -O0 -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo
-c -o $@ $(fixed_SOURCES)
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o
$@ $<
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
Index: etl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/etl.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- etl.info 1 Aug 2013 08:07:22 -0000 1.10
+++ etl.info 1 Aug 2013 19:47:24 -0000 1.11
@@ -1,25 +1,30 @@
Package: etl
-Version: 0.04.15
+Version: 0.04.16
Revision: 1
-Source-MD5: aac5038cdb4067100e57fb52337b0cfd
-
+Description: C++ template library for synfig
+License: GPL
Maintainer: None <fink-de...@lists.sourceforge.net>
-
-BuildDepends: x11-dev, autoconf2.6, automaken, fink (>= 0.24.12)
-BuildDependsOnly: True
Depends: pkgconfig
+BuildDepends: x11-dev
+BuildDependsOnly: True
+Source: mirror:sourceforge:synfig/ETL-%v.tar.gz
+Source-MD5: e330d2045e980d424beb054423c73797
+Source-Checksum: SHA1(1d80f0f8b16aab2f6a86b07be8a7b73da4c7f75f)
-Description: C++ template library for synfig
-Homepage: http://synfig.sourceforge.net/
-License: GPL
+PatchFile: %n.patch
+PatchFile-MD5: 6a19aa67ef46164f830319bb43e4e179
-Source: mirror:sourceforge:synfig/ETL-%v.tar.gz
+InfoTest: TestScript: make check || exit 2
DocFiles: AUTHORS COPYING INSTALL NEWS README
-
+Homepage: http://synfig.sourceforge.net/
DescDetail: <<
ETL is a template library for synfig.
<<
DescPackaging: <<
Depends:pkgconfig because ETL-config program runs it.
<<
+DescPort: <<
+Compiling a test program hangs at -O2, so force -O0 for just that one
+http://www.synfig.org/forums/viewtopic.php?f=15&t=4474
+<<
Index: synfig.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- synfig.patch 16 Apr 2012 21:12:12 -0000 1.4
+++ synfig.patch 1 Aug 2013 19:47:24 -0000 1.5
@@ -1,465 +1,72 @@
-diff -Naur synfig-0.63.03.orig/src/modules/mod_magickpp/trgt_magickpp.cpp
synfig-0.63.03/src/modules/mod_magickpp/trgt_magickpp.cpp
---- synfig-0.63.03.orig/src/modules/mod_magickpp/trgt_magickpp.cpp
2011-12-13 23:07:26.000000000 -0800
-+++ synfig-0.63.03/src/modules/mod_magickpp/trgt_magickpp.cpp 2011-12-13
23:07:56.000000000 -0800
-@@ -66,7 +66,7 @@
+diff -ruN synfig-0.64.0-orig/configure.ac synfig-0.64.0/configure.ac
+--- synfig-0.64.0-orig/configure.ac 2013-05-09 12:32:41.000000000 -0400
++++ synfig-0.64.0/configure.ac 2013-07-29 19:54:21.000000000 -0400
+@@ -160,11 +160,11 @@
+ ])
+ if test $with_magickpp = "yes" ; then {
+ AC_CHECK_HEADER([Magick++.h],[
+- MAGICKPP_LIBS="-lMagick++"
++ MAGICKPP_LIBS="@FINK_MAGICKPP_LIBS@"
+ AC_DEFINE(HAVE_MAGICKPP,[], [ Define if Magick++ library is available ]
)
+ AC_SUBST(MAGICKPP_LIBS)
+ AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
+- AC_CHECK_LIB(Magick,OptimizeImageTransparency,[
++ AC_CHECK_LIB(MagickCore-Q16HDRI,OptimizeImageTransparency,[
+ AC_DEFINE(HAVE_MAGICK_OPTIMIZE,[], [ Define if Magick++ defines
OptimizeImageTransparency() ] )
+ AM_CONDITIONAL(HAVE_MAGICK_OPTIMIZE,true)
+ ],[
+diff -ruN synfig-0.64.0-orig/src/modules/mod_magickpp/trgt_magickpp.cpp
synfig-0.64.0/src/modules/mod_magickpp/trgt_magickpp.cpp
+--- synfig-0.64.0-orig/src/modules/mod_magickpp/trgt_magickpp.cpp
2013-05-09 12:32:41.000000000 -0400
++++ synfig-0.64.0/src/modules/mod_magickpp/trgt_magickpp.cpp 2013-07-29
19:54:21.000000000 -0400
+@@ -53,16 +53,16 @@
+ /* === M E T H O D S =======================================================
*/
+
+ template <class Container>
+-MagickLib::Image* copy_image_list(Container& container)
++MagickCore::Image* copy_image_list(Container& container)
+ {
+ typedef typename Container::iterator Iter;
+- MagickLib::Image* previous = 0;
+- MagickLib::Image* first = NULL;
+- MagickLib::ExceptionInfo exceptionInfo;
+- MagickLib::GetExceptionInfo(&exceptionInfo);
++ MagickCore::Image* previous = 0;
++ MagickCore::Image* first = NULL;
++ MagickCore::ExceptionInfo exceptionInfo;
++ MagickCore::GetExceptionInfo(&exceptionInfo);
+ for (Iter iter = container.begin(); iter != container.end(); ++iter)
+ {
+- MagickLib::Image* current;
++ MagickCore::Image* current;
try
{
-- current = CloneImage(iter->image(), 0, 0,
Magick::MagickTrue, &exceptionInfo);
-+ current = CloneImage(iter->image(), 0, 0, MagickTrue,
&exceptionInfo);
+@@ -86,8 +86,8 @@
- if (!first) first = current;
+ magickpp_trgt::~magickpp_trgt()
+ {
+- MagickLib::ExceptionInfo exceptionInfo;
+- MagickLib::GetExceptionInfo(&exceptionInfo);
++ MagickCore::ExceptionInfo exceptionInfo;
++ MagickCore::GetExceptionInfo(&exceptionInfo);
-@@ -101,7 +101,7 @@
- image.fileName(filename);
- try
- {
--
SetImageInfo(image.imageInfo(),Magick::MagickTrue,&exceptionInfo);
-+
SetImageInfo(image.imageInfo(),MagickTrue,&exceptionInfo);
- can_adjoin = image.adjoin();
- }
- catch(Magick::Warning warning) {
-diff -Naur synfig-0.63.03.orig/src/modules/mod_png/mptr_png.cpp.orig
synfig-0.63.03/src/modules/mod_png/mptr_png.cpp.orig
---- synfig-0.63.03.orig/src/modules/mod_png/mptr_png.cpp.orig 1969-12-31
16:00:00.000000000 -0800
-+++ synfig-0.63.03/src/modules/mod_png/mptr_png.cpp.orig 2011-12-05
09:36:08.000000000 -0800
-@@ -0,0 +1,440 @@
-+/* === S Y N F I G =========================================================
*/
-+/*! \file mptr_png.cpp
-+** \brief ppm Target Module
-+**
-+** $Id$
-+**
-+** \legal
-+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-+** Copyright (c) 2007 Chris Moore
-+**
-+** This package is free software; you can redistribute it and/or
-+** modify it under the terms of the GNU General Public License as
-+** published by the Free Software Foundation; either version 2 of
-+** the License, or (at your option) any later version.
-+**
-+** This package is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+** General Public License for more details.
-+** \endlegal
-+**
-+** === N O T E S ===========================================================
-+**
-+** =========================================================================
*/
-+
-+/*!
-+** \todo Support 16 bit PNG files
-+** \todo Support GAMMA correction
-+** \todo Fix memory leaks
-+*/
-+
-+/* === H E A D E R S =======================================================
*/
-+
-+#ifdef USING_PCH
-+# include "pch.h"
-+#else
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "mptr_png.h"
-+#include <synfig/importer.h>
-+#include <synfig/time.h>
-+#include <synfig/general.h>
-+
-+
-+#include <cstdio>
-+#include <algorithm>
-+#include <functional>
-+#endif
-+
-+/* === M A C R O S =========================================================
*/
-+
-+using namespace synfig;
-+using namespace std;
-+using namespace etl;
-+
-+#define PNG_CHECK_BYTES 8
-+
-+/* === G L O B A L S =======================================================
*/
-+
-+SYNFIG_IMPORTER_INIT(png_mptr);
-+SYNFIG_IMPORTER_SET_NAME(png_mptr,"png");
-+SYNFIG_IMPORTER_SET_EXT(png_mptr,"png");
-+SYNFIG_IMPORTER_SET_VERSION(png_mptr,"0.1");
-+SYNFIG_IMPORTER_SET_CVS_ID(png_mptr,"$Id$");
-+
-+/* === M E T H O D S =======================================================
*/
-+
-+void
-+png_mptr::png_out_error(png_struct */*png_data*/,const char *msg)
-+{
-+ //png_mptr *me=(png_mptr*)png_data->error_ptr;
-+ synfig::error(strprintf("png_mptr: error: %s",msg));
-+ //me->ready=false;
-+}
-+
-+void
-+png_mptr::png_out_warning(png_struct */*png_data*/,const char *msg)
-+{
-+ //png_mptr *me=(png_mptr*)png_data->error_ptr;
-+ synfig::warning(strprintf("png_mptr: warning: %s",msg));
-+ //me->ready=false;
-+}
-+
-+int
-+png_mptr::read_chunk_callback(png_struct */*png_data*/, png_unknown_chunkp
/*chunk*/)
-+{
-+ /* The unknown chunk structure contains your
-+ chunk data: */
-+ //png_byte name[5];
-+ //png_byte *data;
-+ //png_size_t size;
-+ /* Note that libpng has already taken care of
-+ the CRC handling */
-+
-+ /* put your code here. Return one of the
-+ following: */
-+
-+ //return (-n); /* chunk had an error */
-+ return (0); /* did not recognize */
-+ //return (n); /* success */
-+}
-+
-+png_mptr::png_mptr(const char *file_name)
-+{
-+ filename=file_name;
-+
-+ /* Open the file pointer */
-+ FILE *file = fopen(file_name, "rb");
-+ if (!file)
-+ {
-+ //! \todo THROW SOMETHING
-+ throw strprintf("Unable to physically open %s",file_name);
-+ return;
-+ }
-+
-+
-+ /* Make sure we are dealing with a PNG format file */
-+ png_byte header[PNG_CHECK_BYTES];
-+ fread(header, 1, PNG_CHECK_BYTES, file);
-+ bool is_png = !png_sig_cmp(header, 0, PNG_CHECK_BYTES);
-+ if (!is_png)
-+ {
-+ //! \todo THROW SOMETHING
-+ throw strprintf("This (\"%s\") doesn't appear to be a PNG
file",file_name);
-+ return;
-+ }
-+
-+
-+ png_structp png_ptr = png_create_read_struct
-+ (PNG_LIBPNG_VER_STRING, (png_voidp)this,
-+ &png_mptr::png_out_error, &png_mptr::png_out_warning);
-+ if (!png_ptr)
-+ {
-+ //! \todo THROW SOMETHING
-+ throw String("error on importer construction, *WRITEME*3");
-+ return;
-+ }
-+
-+ png_infop info_ptr = png_create_info_struct(png_ptr);
-+ if (!info_ptr)
-+ {
-+ png_destroy_read_struct(&png_ptr,
-+ (png_infopp)NULL, (png_infopp)NULL);
-+ //! \todo THROW SOMETHING
-+ throw String("error on importer construction, *WRITEME*4");
-+ return;
-+ }
-+
-+ png_infop end_info = png_create_info_struct(png_ptr);
-+ if (!end_info)
-+ {
-+ png_destroy_read_struct(&png_ptr, &info_ptr,
-+ (png_infopp)NULL);
-+ //! \todo THROW SOMETHING
-+ throw String("error on importer construction, *WRITEME*4");
-+ return;
-+ }
-+
-+
-+
-+ png_init_io(png_ptr, file);
-+ png_set_sig_bytes(png_ptr,PNG_CHECK_BYTES);
-+
-+ png_read_info(png_ptr, info_ptr);
-+
-+ int bit_depth,color_type,interlace_type, compression_type,filter_method;
-+ png_uint_32 width,height;
-+
-+ png_get_IHDR(png_ptr, info_ptr, &width, &height,
-+ &bit_depth, &color_type, &interlace_type,
-+ &compression_type, &filter_method);
-+
-+ if (bit_depth == 16)
-+ png_set_strip_16(png_ptr);
-+
-+ if (bit_depth < 8)
-+ png_set_packing(png_ptr);
-+
-+ double fgamma;
-+ if (png_get_gAMA(png_ptr, info_ptr, &fgamma))
-+ {
-+ synfig::info("PNG: Image gamma is %f",fgamma);
-+ png_set_gamma(png_ptr, gamma().get_gamma(), fgamma);
-+ }
-+
-+
-+ /*
-+ if (setjmp(png_jmpbuf(png_ptr)))
-+ {
-+ synfig::error("Unable to setup longjump");
-+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-+ fclose(file);
-+ //! \todo THROW SOMETHING
-+ throw String("error on importer construction, *WRITEME*5");
-+ return;
-+ }
-+ */
-+
-+ png_set_read_user_chunk_fn(png_ptr, this,
&png_mptr::read_chunk_callback);
-+
-+ // man libpng tells me:
-+ // You must use png_transforms and not call any
-+ // png_set_transform() functions when you use png_read_png().
-+ // but we used png_set_gamma(), which may be why we were seeing a crash
at the end
-+ // png_read_png(png_ptr, info_ptr,
PNG_TRANSFORM_PACKING|PNG_TRANSFORM_STRIP_16, NULL);
-+
-+ png_read_update_info(png_ptr, info_ptr);
-+ png_uint_32 rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-+
-+ // allocate buffer to read image data into
-+ png_bytep *row_pointers=new png_bytep[height];
-+ png_byte *data = new png_byte[rowbytes*height];
-+ for (png_uint_32 i = 0; i < height; i++)
-+ row_pointers[i] = &(data[rowbytes*i]);
-+
-+ png_read_image(png_ptr, row_pointers);
-+
-+ png_uint_32 x, y;
-+ surface_buffer.set_wh(width,height);
-+
-+ switch(color_type)
-+ {
-+ case PNG_COLOR_TYPE_RGB:
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ {
-+ float r=gamma().r_U8_to_F32((unsigned
char)row_pointers[y][x*3+0]);
-+ float g=gamma().g_U8_to_F32((unsigned
char)row_pointers[y][x*3+1]);
-+ float b=gamma().b_U8_to_F32((unsigned
char)row_pointers[y][x*3+2]);
-+ surface_buffer[y][x]=Color(
-+ r,
-+ g,
-+ b,
-+ 1.0
-+ );
-+/*
-+ surface_buffer[y][x]=Color(
-+ (float)(unsigned
char)row_pointers[y][x*3+0]*(1.0/255.0),
-+ (float)(unsigned
char)row_pointers[y][x*3+1]*(1.0/255.0),
-+ (float)(unsigned
char)row_pointers[y][x*3+2]*(1.0/255.0),
-+ 1.0
-+ );
-+*/
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_RGB_ALPHA:
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ {
-+ float r=gamma().r_U8_to_F32((unsigned
char)row_pointers[y][x*4+0]);
-+ float g=gamma().g_U8_to_F32((unsigned
char)row_pointers[y][x*4+1]);
-+ float b=gamma().b_U8_to_F32((unsigned
char)row_pointers[y][x*4+2]);
-+ surface_buffer[y][x]=Color(
-+ r,
-+ g,
-+ b,
-+ (float)(unsigned
char)row_pointers[y][x*4+3]*(1.0/255.0)
-+ );
-+ /*
-+ surface_buffer[y][x]=Color(
-+ (float)(unsigned
char)row_pointers[y][x*4+0]*(1.0/255.0),
-+ (float)(unsigned
char)row_pointers[y][x*4+1]*(1.0/255.0),
-+ (float)(unsigned
char)row_pointers[y][x*4+2]*(1.0/255.0),
-+ (float)(unsigned
char)row_pointers[y][x*4+3]*(1.0/255.0)
-+ );
-+ */
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_GRAY:
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ {
-+ float gray=gamma().g_U8_to_F32((unsigned
char)row_pointers[y][x]);
-+ //float gray=(float)(unsigned
char)row_pointers[y][x]*(1.0/255.0);
-+ surface_buffer[y][x]=Color(
-+ gray,
-+ gray,
-+ gray,
-+ 1.0
-+ );
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_GRAY_ALPHA:
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ {
-+ float gray=gamma().g_U8_to_F32((unsigned
char)row_pointers[y][x*2]);
-+// float gray=(float)(unsigned
char)row_pointers[y][x*2]*(1.0/255.0);
-+ surface_buffer[y][x]=Color(
-+ gray,
-+ gray,
-+ gray,
-+ (float)(unsigned
char)row_pointers[y][x*2+1]*(1.0/255.0)
-+ );
-+ }
-+ break;
-+
-+ case PNG_COLOR_TYPE_PALETTE:
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ {
-+ png_colorp palette;
-+ int num_palette;
-+ png_get_PLTE(png_ptr, info_ptr, &palette,
&num_palette);
-+ float r=gamma().r_U8_to_F32((unsigned
char)palette[row_pointers[y][x]].red);
-+ float g=gamma().g_U8_to_F32((unsigned
char)palette[row_pointers[y][x]].green);
-+ float b=gamma().b_U8_to_F32((unsigned
char)palette[row_pointers[y][x]].blue);
-+ float a=1.0;
-+ if(png_get_valid(png_ptr, info_ptr,
PNG_INFO_tRNS))
-+ {
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-+ png_get_tRNS(png_ptr, info_ptr,
&trans_alpha, &num_trans, &trans_color);
-+ a = (float)(unsigned
char)trans_alpha[row_pointers[y][x]]*(1.0/255.0);
-+ }
-+ surface_buffer[y][x]=Color(
-+ r,
-+ g,
-+ b,
-+ a
-+ );
-+ }
-+ break;
-+ default:
-+ synfig::error("png_mptr: error: Unsupported color type");
-+ //! \todo THROW SOMETHING
-+ throw String("error on importer construction, *WRITEME*6");
-+ return;
-+ }
-+
-+ png_read_end(png_ptr, end_info);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-+ fclose(file);
-+
-+ delete [] row_pointers;
-+ delete [] data;
-+
-+ trim = false;
-+
-+ //if (getenv("SYNFIG_DISABLE_CROP_IMPORTED_IMAGES"))
-+ return;
-+
-+ switch(color_type)
-+ {
-+ case PNG_COLOR_TYPE_RGB_ALPHA:
-+ case PNG_COLOR_TYPE_GRAY_ALPHA:
-+ case PNG_COLOR_TYPE_PALETTE:
-+ for(y=0;y<height;y++)
-+ {
-+ for(x=0;x<width;x++)
-+ if (surface_buffer[y][x].get_a()) break;
-+ if (x != width) break;
-+ }
-+
-+ if (y != height)
-+ {
-+#define BORDER 1 // don't chop off all the
transparent space - leave a border this many pixels wide for the interpolation
-+
-+ png_uint_32 min_x, min_y, max_x, max_y;
-+ if (y>BORDER) min_y = y-BORDER; else min_y = 0;
-+
-+ for(y=height-1;y>0;y--)
-+ {
-+ for(x=0;x<width;x++)
-+ if (surface_buffer[y][x].get_a()) break;
-+ if (x != width) break;
-+ }
-+ max_y = std::min(y+BORDER,height-1);
-+
-+ for(x=0;x<width;x++)
-+ {
-+ for(y=0;y<height;y++)
-+ if (surface_buffer[y][x].get_a()) break;
-+ if (y != height) break;
-+ }
-+ if (x>BORDER) min_x = x-BORDER; else min_x = 0;
-+
-+ for(x=width-1;x>0;x--)
-+ {
-+ for(y=0;y<height;y++)
-+ if (surface_buffer[y][x].get_a()) break;
-+ if (y != height) break;
-+ }
-+ max_x = std::min(x+BORDER,width-1);
-+
-+ if (min_x != 0 || max_x != width-1 ||
-+ min_y != 0 || max_y != height-1)
-+ {
-+ trim = true;
-+ orig_width = width;
-+ orig_height = height;
-+ trimmed_x = min_x;
-+ trimmed_y = min_y;
-+
-+ width=max_x-min_x+1;
-+ height=max_y-min_y+1;
-+ synfig::Surface tmp_buffer;
-+ tmp_buffer.set_wh(width,height);
-+ for(y=0;y<height;y++)
-+ for(x=0;x<width;x++)
-+ tmp_buffer[y][x] =
surface_buffer[y+min_y][x+min_x];
-+ surface_buffer = tmp_buffer;
-+ }
-+ }
-+ }
-+}
-+
-+png_mptr::~png_mptr()
-+{
-+}
-+
-+bool
-+png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc
&/*renddesc*/, Time, synfig::ProgressCallback */*cb*/)
-+{
-+ //assert(0); // shouldn't be called?
-+ surface=surface_buffer;
-+ return true;
-+}
-+
-+bool
-+png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc
&renddesc, Time,
-+ bool &trimmed, unsigned int &width,
unsigned int &height, unsigned int &top, unsigned int &left,
-+ synfig::ProgressCallback */*cb*/)
-+{
-+ surface=surface_buffer;
-+ if ((trimmed = trim))
-+ {
-+ width = orig_width;
-+ height = orig_height;
-+ top = trimmed_y;
-+ left = trimmed_x;
-+ }
-+ return true;
-+}
+ try
+ {
+@@ -126,7 +126,7 @@
+ // when we destroy our container, the image is
re-freed, failing an assertion
+
+ synfig::info("copying image list");
+- MagickLib::Image *image_list = copy_image_list(images);
++ MagickCore::Image *image_list = copy_image_list(images);
+
+ synfig::info("clearing old image list");
+ images.clear();
+@@ -176,7 +176,7 @@
+ // nothing is moving, we end up with objects
disappearing when they shouldn't
+
+ // linkImages(images.begin(), images.end());
+- // MagickLib::Image* new_images =
DeconstructImages(images.begin()->image(),&exceptionInfo);
++ // MagickCore::Image* new_images =
DeconstructImages(images.begin()->image(),&exceptionInfo);
+ // unlinkImages(images.begin(), images.end());
+ // images.clear();
+ // insertImages(&images, new_images);
Index: synfigstudio.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfigstudio.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- synfigstudio.info 13 Jul 2013 19:35:16 -0000 1.8
+++ synfigstudio.info 1 Aug 2013 19:47:24 -0000 1.9
@@ -1,20 +1,21 @@
Package: synfigstudio
-Version: 0.63.05
+Version: 0.64.0
Revision: 1
Source: mirror:sourceforge:synfig/synfigstudio-%v.tar.gz
-Source-MD5: ca01b7523118e32c904b681d8ff0a085
+Source-MD5: bbda14359a07254b8efe5e706de192df
+Source-Checksum: SHA1(c85d504f98f1e33ef2b08badc3f651123076085e)
Maintainer: None <fink-de...@lists.sourceforge.net>
Depends: <<
%N-shlibs (= %v-%r),
- atk1-shlibs (>= 1.28.0-1),
- cairo-shlibs (>= 1.8.8-3),
- cairomm1-shlibs (>= 1.8.2-3),
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ atk1-shlibs (>= 1.32.0-1),
+ cairo-shlibs (>= 1.12.14-1),
+ cairomm1-shlibs (>= 1.10.0-2),
+ fontconfig2-shlibs (>= 2.10.2-1),
+ freetype219-shlibs (>= 2.4.11-1),
glib2-shlibs (>=2.22.0-1),
glibmm2.4-shlibs (>=2.20.2-2),
gtk+2-shlibs (>= 2.18.0-1),
@@ -22,40 +23,38 @@
libgettext8-shlibs,
libsigc++2-shlibs (>=2.2.4.2-2),
libxml++2-shlibs (>=2.26.1-2),
- libxml2-shlibs (>=2.6.32-1),
- pango1-xft2-ft219-shlibs (>=1.24.5-4),
+ libxml2-shlibs (>= 2.9.1-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-7),
pangomm1.4.1-shlibs (>= 2.26.0-1),
synfig-shlibs (>= %v-1),
x11
<<
BuildDepends: <<
- autoconf2.6,
- automake1.11,
- fink (>= 0.24.12),
- synfig(>=%v-1),
- synfig-dev(>=%v-1),
- atk1 (>=1.28.0-1),
- cairo (>=1.8.8-3),
- cairomm1 (>=1.8.2-3),
- etl (>= 0.04.14-2),
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ atk1 (>= 1.32.0-1),
+ cairo (>= 1.12.14-1),
+ cairomm1 (>= 1.10.0-2),
+ etl (>= 0.04.15-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.10.2-1),
+ freetype219 (>= 2.4.11-1),
gettext-tools,
- glib2-dev (>=2.22.0-1),
- glibmm2.4-dev (>=2.22.0-1),
- glitz (>=0.5.6-3),
- gtk+2-dev (>=2.18.0-1),
+ glib2-dev (>= 2.22.0-1),
+ glibmm2.4-dev (>= 2.22.0-1),
+ gtk+2-dev (>= 2.18.0-1),
gtkmm2.4-gtk-dev (>= 2.18.0-1),
- lcms,
+ intltool40,
+ lcms2,
libgettext8-dev,
- libsigc++2 (>=2.2.4.2-2),
+ libsigc++2 (>= 2.2.4.2-2),
libtool2,
- libxml++2 (>=2.26.1-2),
- libxml2 (>=2.6.32-1),
- pango1-xft2-ft219-dev (>=1.24.5-4),
+ libxml++2 (>= 2.26.1-2),
+ libxml2 (>= 2.9.1-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-7),
pangomm1.4.1 (>= 2.26.0-1),
- pkgconfig (>=0.23-2),
- pixman (>=0.16.0-1),
+ pkgconfig (>= 0.23-2),
+ pixman (>= 0.30.0-1),
+ synfig (>= %v-1),
+ synfig-dev (>= %v-1),
x11-dev
<<
@@ -63,26 +62,30 @@
Homepage: http://synfig.org/
License: GPL
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
-ConfigureParams:
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--disable-update-mimedb
+GCC: 4.0
+#SetCPPFLAGS: -I%p/lib/fontconfig2/include
+#SetLDFLAGS: -L%p/lib/fontconfig2/lib
+ConfigureParams: --disable-update-mimedb --datarootdir=%p/share
--localedir=%p/share/locale DATADIRNAME=share
CompileScript: <<
#!/bin/sh -ev
- autoreconf -if
./configure %c
- make -j1
+ make
+ fink-package-precedence .
+<<
+InstallScript: <<
+ make install DESTDIR=%d
<<
-
SplitOff: <<
Package: %N-shlibs
Depends: <<
+ cairo-shlibs (>= 1.12.14-1),
glib2-shlibs (>= 2.22.0-1),
glibmm2.4-shlibs (>=2.22.0-1),
libgettext8-shlibs,
libsigc++2-shlibs (>=2.2.4.2-2),
libxml++2-shlibs (>= 2.26.1-2),
- libxml2-shlibs (>= 2.6.32-1),
+ libxml2-shlibs (>= 2.9.1-2),
synfig-shlibs (>= %v-1)
<<
Files: lib/libsynfigapp.0.dylib
Index: synfig.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfig.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- synfig.info 1 Aug 2013 10:44:46 -0000 1.12
+++ synfig.info 1 Aug 2013 19:47:24 -0000 1.13
@@ -1,85 +1,81 @@
Package: synfig
-Version: 0.63.05
-
-Revision: 2
-
-Source: mirror:sourceforge:synfig/synfig-%v.tar.gz
-Source-MD5: 8591cf17c26405d68d2cc050a2929292
-
-PatchFile: %n.patch
-PatchFile-MD5: 5d0b718619e1b46147cd336392af30d5
-
+Version: 0.64.0
+Revision: 1
+Description: Vector-based 2D animation renderer
+License: GPL
Maintainer: None <fink-de...@lists.sourceforge.net>
Depends: <<
- %N-shlibs (=%v-%r),
- glib2-shlibs (>=2.22.0-1),
- glibmm2.4-shlibs (>=2.22.0-1),
+ %N-shlibs (= %v-%r),
+ boost1.53.nopython-shlibs,
+ cairo-shlibs (>= 1.12.14-1),
+ glib2-shlibs (>= 2.22.0-1),
+ glibmm2.4-shlibs (>= 2.22.0-1),
libgettext8-shlibs,
- libsigc++2-shlibs (>=2.2.4.2-2),
+ libsigc++2-shlibs (>= 2.2.4.2-2),
libtool2-shlibs,
- libxml++2-shlibs (>=2.26.1-2),
- libxml2-shlibs (>=2.9.1-1)
+ libxml++2-shlibs (>= 2.26.1-2),
+ libxml2-shlibs (>= 2.9.1-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-7)
<<
BuildDepends: <<
autoconf2.6,
- automake1.11,
+ automake1.13,
+ boost1.53.nopython,
+ cairo (>= 1.12.14-1),
+ etl (>= 0.04.16-1),
fink-package-precedence,
- etl (>= 0.04.14-2),
fontconfig2-dev (>= 2.10.0-1),
freetype219 (>= 2.4.11-1),
- glib2-dev (>=2.22.0-1),
- glibmm2.4-dev (>=2.22.0-1),
- graphicsmagick-dev,
+ gettext-tools,
+ glib2-dev (>= 2.22.0-1),
+ glibmm2.4-dev (>= 2.22.0-1),
ilmbase,
+ imagemagick7-dev,
libgettext8-dev,
- libiconv-dev (>=1.12-3),
+ libiconv-dev (>= 1.12-3),
libjpeg9,
libmng2,
libopenexr6,
libpng16,
- libsigc++2 (>=2.2.4.2-2),
+ libsigc++2 (>= 2.2.4.2-2),
libtool2,
- libxml++2 (>=2.26.1-2),
- libxml2 (>=2.9.1-1),
+ libxml++2 (>= 2.26.1-2),
+ libxml2 (>= 2.6.32-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-7),
pkgconfig (>= 0.23-2)
<<
+Source: mirror:sourceforge:synfig/synfig-%v.tar.gz
+Source-MD5: 124cb4059b9f48dc5c37204660053d6f
+Source-Checksum: SHA1(b33a4b4eeb957aa141df156ebf9e397fe4bf1503)
-GCC: 4.0
-
-Description: Vector-based 2D animation renderer
-Homepage: http://synfig.org/
-License: GPL
-
+PatchFile: %n.patch
+PatchFile-MD5: e9d51c15dcbf6054d05e247345254f2e
PatchScript: <<
%{default_script}
- perl -pi -e 's/-lMagick/-lGraphicsMagick/' configure
+ ## turn off avcodec module
perl -ni -e 'print unless /mod_libavcodec/'
src/modules/synfig_modules.cfg.in
-#
-# # These two fix for the split of libMagick in recent releases - AdamW
- sed -i -e
's.Magick,OptimizeImageTransparency.MagickCore,OptimizeImageTransparency.g'
configure
-# sed -i -e 's,MagickLib::,MagickCore::,g'
src/modules/mod_magickpp/trgt_magickpp.cpp
-#
-# perl -pi -e 's,(-lMagick\+\+),\1 -L/usr/X11R6/lib,' configure
-#
-# # configure checks for Magick++ but uses it to decide to use
-# # symbols in MagickCore directly as well
- perl -pi -e 's/-lMagick\+\+/-lGraphicsMagick++ -lGraphicsMagick/'
configure.ac
-#
-# # directly uses libxml, not just c++ wrappers
- perl -pi -e 's/(libxml\+\+-2.6)/\1 libxml2/g' configure
-<<
-SetCPPFLAGS: -I%p/include/GraphicsMagick -I%p/lib/fontconfig2/include
-I%p/include/libxml2
-SetLDFLAGS: -L%p/lib/fontconfig2/lib -lxml2
-ConfigureParams: --without-libavcodec
+ ### pass MAGICKPP_LIBS to configure
+ perl -pi -e "s|\@FINK_MAGICKPP_LIBS\@|`%p/bin/magick++-config
--libs`|g" configure.ac
+<<
+# from Magick++-config --cppflags
+SetCPPFLAGS: -I%p/include/ImageMagick -DMAGICKCORE_HDRI_ENABLE=1
-DMAGICKCORE_QUANTUM_DEPTH=16 -I%p/include/libxml2
+SetLDFLAGS: -lxml2
+ConfigureParams: <<
+ --with-ffmpeg \
+ --without-libavcodec \
+ --without-libswscale \
+ --enable-dependency-tracking \
+ --with-boost-libdir=%p/lib
+<<
+GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
- libtoolize --ltdl --copy -f
autoreconf -if
./configure %c
- make # -j1
+ make
fink-package-precedence --prohibit-bdep=%N-dev .
<<
@@ -96,12 +92,13 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
+ cairo-shlibs (>= 1.12.14-1),
fontconfig2-shlibs (>= 2.10.0-1),
freetype219-shlibs (>= 2.4.11-1),
glib2-shlibs (>= 2.22.0-1),
glibmm2.4-shlibs (>= 2.22.0-1),
- graphicsmagick,
- graphicsmagick-shlibs,
+ ilmbase-shlibs,
+ imagemagick7-shlibs,
libgettext8-shlibs,
libjpeg9-shlibs,
libmng2-shlibs,
@@ -110,7 +107,8 @@
libsigc++2-shlibs (>=2.2.3-1),
libtool2-shlibs,
libxml++2-shlibs (>= 2.26.1-2),
- libxml2-shlibs (>= 2.9.1-1)
+ libxml2-shlibs (>= 2.9.1-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-7)
<<
Files: lib/libsynfig.0.dylib lib/synfig
# move share/locale from %N? (rename with libmajorversion?)
@@ -132,7 +130,7 @@
<<
DocFiles: AUTHORS COPYING INSTALL NEWS README
-
+Homepage: http://synfig.org/
DescDetail: <<
synfig is a vector based 2D animation renderer. It is designed to be capable of
producing feature-film quality animation.
@@ -144,17 +142,17 @@
Disable libavcodec because it's a newer version in fink
incompatible with synfig. See:
http://synfig.org/forums/viewtopic.php?f=13&t=5
- Older libavcoded has no .pc so synfig doesn't even find it.
+ Older libavcodec has no .pc so synfig doesn't even find it.
Remove libavcodec from config file (list of active mods)
because it won't exist (silences runtime warnings). Why isn't
this list auto-generated during pkg build process?
Doesn't use Magick's native flag detector:
-
Need to pass -I globally so that configure finds it.
- Main lib is now MagickCore not Magick.
+ Main ImageMagick lib is now MagickCore not Magick.
+ http://www.synfig.org/issues/thebuggenie/synfig/issues/56
Links magick libs and also uses magick's "convert" program.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
