diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/etl/Makefile | 1 | ||||
| -rw-r--r-- | devel/etl/files/patch-ETL___stringf.h | 11 | ||||
| -rw-r--r-- | devel/etl/files/patch-ETL___surface.h | 10 | ||||
| -rw-r--r-- | devel/synfig/Makefile | 65 | ||||
| -rw-r--r-- | devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp | 72 | ||||
| -rw-r--r-- | devel/synfig/pkg-plist | 65 |
6 files changed, 154 insertions, 70 deletions
diff --git a/devel/etl/Makefile b/devel/etl/Makefile index 8b2b0fb0ec45..bacc459ab346 100644 --- a/devel/etl/Makefile +++ b/devel/etl/Makefile @@ -3,6 +3,7 @@ PORTNAME= etl PORTVERSION= 0.04.17 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= SF/synfig/releases/${SYNFIG_VERSION}/source/ DISTNAME= ETL-${PORTVERSION} diff --git a/devel/etl/files/patch-ETL___stringf.h b/devel/etl/files/patch-ETL___stringf.h new file mode 100644 index 000000000000..72bfd2c84f55 --- /dev/null +++ b/devel/etl/files/patch-ETL___stringf.h @@ -0,0 +1,11 @@ +--- ETL/_stringf.h.orig ++++ ETL/_stringf.h +@@ -57,7 +57,7 @@ + + _ETL_BEGIN_CDECLS + +-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_WIN32) ++#if defined(__clang__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(_WIN32) + #define ETL_NO_THROW + #else + #define ETL_NO_THROW throw() diff --git a/devel/etl/files/patch-ETL___surface.h b/devel/etl/files/patch-ETL___surface.h new file mode 100644 index 000000000000..950e4a43bd65 --- /dev/null +++ b/devel/etl/files/patch-ETL___surface.h @@ -0,0 +1,10 @@ +--- ETL/_surface.h.orig ++++ ETL/_surface.h +@@ -34,6 +34,7 @@ + #include "_misc.h" + #include <algorithm> + #include <cstring> ++#include <cstdlib> + + /* === M A C R O S ========================================================= */ + diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index 4917c98cab16..14bf42b926b2 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -2,59 +2,68 @@ # $FreeBSD$ PORTNAME= synfig -DISTVERSION= 0.63.05 -PORTREVISION= 6 +PORTVERSION= 0.63.05 +PORTREVISION= 7 CATEGORIES= devel graphics multimedia -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/source MAINTAINER= ports@FreeBSD.org COMMENT= Vector based 2D animation package -# update to 0.64.1 does pick up ImageMagick correctly but there are a -# multitude of c++ build failures which are beyond my skill to fix .. -BROKEN= Doesn't pickup ImageMagick anymore. +LICENSE= GPLv3 -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl +BUILD_DEPENDS= etl>=0.04.17:${PORTSDIR}/devel/etl LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \ + libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libmng.so:${PORTSDIR}/graphics/libmng \ libpng15.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ - libdv.so:${PORTSDIR}/multimedia/libdv \ - libIlmImf.so:${PORTSDIR}/graphics/OpenEXR + libdv.so:${PORTSDIR}/multimedia/libdv -USE_GNOME= gnomehack glib20 glibmm libxml++26 -USES= gettext +USES= gettext libtool pathfix pkgconfig +USE_GNOME= cairo glibmm libxml++26 GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USE_LDCONFIG= yes + +CPPFLAGS+= $$(Magick++-config --cppflags) CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \ - /optimization_flags/s|CFLAGS=|#CFLAGS=|' -e \ - 's|el_GR|el|g' -e \ - 's|no_NO|no|g' -e \ - 's|pl_PL|pl|g' -e \ - 's|sk_SK|sk|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/url_fclose/s|&formatc|formatc|g' \ + @${REINPLACE_CMD} -e \ + '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \ + /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \ + /MAGICKPP_LIBS/s|-lMagick++|`Magick++-config --libs`| ; \ + s|no_NO|no| ; \ + s|pl_PL|pl| ; \ + s|sk_SK|sk| ; \ + s|el_GR|el| ; \ + s|<tr1/|<| ; \ + s|::tr1||' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/url_fclose/s|&formatc|formatc|g' \ ${WRKSRC}/src/modules/mod_libavcodec/trgt_av.cpp +.for i in exception.h layer.h target.h time.h + @${REINPLACE_CMD} -e \ + 's|"string_decl.h"|"string.h"|' \ + ${WRKSRC}/src/synfig/${i} +.endfor +post-build: # FIX LC_MESSAGES - ${MV} ${WRKSRC}/po/no_NO.gmo ${WRKSRC}/po/no.gmo - ${MV} ${WRKSRC}/po/pl_PL.gmo ${WRKSRC}/po/pl.gmo - ${MV} ${WRKSRC}/po/sk_SK.gmo ${WRKSRC}/po/sk.gmo - ${MV} ${WRKSRC}/po/el_GR.gmo ${WRKSRC}/po/el.gmo + @${LN} -sf no_NO.gmo ${WRKSRC}/po/no.gmo + @${LN} -sf pl_PL.gmo ${WRKSRC}/po/pl.gmo + @${LN} -sf sk_SK.gmo ${WRKSRC}/po/sk.gmo + @${LN} -sf el_GR.gmo ${WRKSRC}/po/el.gmo post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include <bsd.port.mk> diff --git a/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp b/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp new file mode 100644 index 000000000000..c08294a961d5 --- /dev/null +++ b/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp @@ -0,0 +1,72 @@ +--- src/modules/mod_magickpp/trgt_magickpp.cpp.orig ++++ src/modules/mod_magickpp/trgt_magickpp.cpp +@@ -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 + { +@@ -86,8 +86,8 @@ + + magickpp_trgt::~magickpp_trgt() + { +- MagickLib::ExceptionInfo exceptionInfo; +- MagickLib::GetExceptionInfo(&exceptionInfo); ++ MagickCore::ExceptionInfo exceptionInfo; ++ MagickCore::GetExceptionInfo(&exceptionInfo); + + try + { +@@ -118,7 +118,6 @@ + for_each(images.begin(), images.end(), Magick::animationDelayImage(delay)); + + // optimize the images (only write the pixels that change from frame to frame +-#ifdef HAVE_MAGICK_OPTIMIZE + // make a completely new image list + // this is required because: + // RemoveDuplicateLayers wants a linked list of images, and removes some of them +@@ -126,7 +125,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(); +@@ -169,18 +168,6 @@ + + synfig::info("recreating image list"); + insertImages(&images, image_list); +-#else +- synfig::info("not optimizing images"); +- // DeconstructImages is available in ImageMagic 6.2.* but it doesn't take +- // the 'dispose' method into account, so for frames with transparency where +- // 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); +- // unlinkImages(images.begin(), images.end()); +- // images.clear(); +- // insertImages(&images, new_images); +-#endif + } + else if (multiple_images) + { diff --git a/devel/synfig/pkg-plist b/devel/synfig/pkg-plist index be09cec2d951..b4320279ba44 100644 --- a/devel/synfig/pkg-plist +++ b/devel/synfig/pkg-plist @@ -1,8 +1,6 @@ bin/synfig bin/synfig-config etc/synfig_modules.cfg -include/synfig-0.0/synfig/valuenode_dilist.h -include/synfig-0.0/synfig/dashitem.h include/synfig-0.0/synfig/activepoint.h include/synfig-0.0/synfig/angle.h include/synfig-0.0/synfig/blinepoint.h @@ -13,6 +11,7 @@ include/synfig-0.0/synfig/color.h include/synfig-0.0/synfig/context.h include/synfig-0.0/synfig/curve_helper.h include/synfig-0.0/synfig/curveset.h +include/synfig-0.0/synfig/dashitem.h include/synfig-0.0/synfig/distance.h include/synfig-0.0/synfig/exception.h include/synfig-0.0/synfig/gamma.h @@ -71,27 +70,35 @@ include/synfig-0.0/synfig/uniqueid.h include/synfig-0.0/synfig/value.h include/synfig-0.0/synfig/valuenode.h include/synfig-0.0/synfig/valuenode_add.h -include/synfig-0.0/synfig/valuenode_animated.h +include/synfig-0.0/synfig/valuenode_and.h include/synfig-0.0/synfig/valuenode_anglestring.h +include/synfig-0.0/synfig/valuenode_animated.h include/synfig-0.0/synfig/valuenode_atan2.h include/synfig-0.0/synfig/valuenode_bline.h include/synfig-0.0/synfig/valuenode_blinecalctangent.h include/synfig-0.0/synfig/valuenode_blinecalcvertex.h include/synfig-0.0/synfig/valuenode_blinecalcwidth.h include/synfig-0.0/synfig/valuenode_blinereversetangent.h +include/synfig-0.0/synfig/valuenode_compare.h include/synfig-0.0/synfig/valuenode_composite.h include/synfig-0.0/synfig/valuenode_const.h include/synfig-0.0/synfig/valuenode_cos.h -include/synfig-0.0/synfig/valuenode_duplicate.h +include/synfig-0.0/synfig/valuenode_dilist.h include/synfig-0.0/synfig/valuenode_dotproduct.h +include/synfig-0.0/synfig/valuenode_duplicate.h include/synfig-0.0/synfig/valuenode_dynamiclist.h include/synfig-0.0/synfig/valuenode_exp.h -include/synfig-0.0/synfig/valuenode_gradientrotate.h include/synfig-0.0/synfig/valuenode_gradientcolor.h -include/synfig-0.0/synfig/valuenode_intstring.h +include/synfig-0.0/synfig/valuenode_gradientrotate.h +include/synfig-0.0/synfig/valuenode_greyed.h include/synfig-0.0/synfig/valuenode_integer.h +include/synfig-0.0/synfig/valuenode_intstring.h include/synfig-0.0/synfig/valuenode_join.h include/synfig-0.0/synfig/valuenode_linear.h +include/synfig-0.0/synfig/valuenode_log.h +include/synfig-0.0/synfig/valuenode_not.h +include/synfig-0.0/synfig/valuenode_or.h +include/synfig-0.0/synfig/valuenode_pow.h include/synfig-0.0/synfig/valuenode_radialcomposite.h include/synfig-0.0/synfig/valuenode_range.h include/synfig-0.0/synfig/valuenode_realstring.h @@ -114,61 +121,35 @@ include/synfig-0.0/synfig/valuenode_vectorangle.h include/synfig-0.0/synfig/valuenode_vectorlength.h include/synfig-0.0/synfig/valuenode_vectorx.h include/synfig-0.0/synfig/valuenode_vectory.h -include/synfig-0.0/synfig/valuenode_log.h -include/synfig-0.0/synfig/valuenode_and.h -include/synfig-0.0/synfig/valuenode_compare.h -include/synfig-0.0/synfig/valuenode_greyed.h -include/synfig-0.0/synfig/valuenode_not.h -include/synfig-0.0/synfig/valuenode_or.h -include/synfig-0.0/synfig/valuenode_pow.h include/synfig-0.0/synfig/valuenode_wplist.h include/synfig-0.0/synfig/vector.h include/synfig-0.0/synfig/version.h include/synfig-0.0/synfig/waypoint.h include/synfig-0.0/synfig/widthpoint.h -lib/libsynfig.la lib/libsynfig.so lib/libsynfig.so.0 -lib/synfig/modules/liblyr_freetype.la +lib/libsynfig.so.0.0.0 lib/synfig/modules/liblyr_freetype.so -lib/synfig/modules/liblyr_std.la lib/synfig/modules/liblyr_std.so -lib/synfig/modules/libmod_bmp.la lib/synfig/modules/libmod_bmp.so -lib/synfig/modules/libmod_dv.la lib/synfig/modules/libmod_dv.so -lib/synfig/modules/libmod_ffmpeg.la +lib/synfig/modules/libmod_example.so lib/synfig/modules/libmod_ffmpeg.so -lib/synfig/modules/libmod_filter.la lib/synfig/modules/libmod_filter.so -lib/synfig/modules/libmod_geometry.la lib/synfig/modules/libmod_geometry.so -lib/synfig/modules/libmod_gif.la lib/synfig/modules/libmod_gif.so -lib/synfig/modules/libmod_gradient.la lib/synfig/modules/libmod_gradient.so -lib/synfig/modules/libmod_imagemagick.la lib/synfig/modules/libmod_imagemagick.so -lib/synfig/modules/libmod_jpeg.la lib/synfig/modules/libmod_jpeg.so -lib/synfig/modules/libmod_mng.la +lib/synfig/modules/libmod_magickpp.so lib/synfig/modules/libmod_mng.so -lib/synfig/modules/libmod_noise.la lib/synfig/modules/libmod_noise.so -lib/synfig/modules/libmod_openexr.la lib/synfig/modules/libmod_openexr.so -lib/synfig/modules/libmod_particle.la lib/synfig/modules/libmod_particle.so -lib/synfig/modules/libmod_png.la lib/synfig/modules/libmod_png.so -lib/synfig/modules/libmod_ppm.la lib/synfig/modules/libmod_ppm.so -lib/synfig/modules/libmod_yuv420p.la -lib/synfig/modules/libmod_yuv420p.so lib/synfig/modules/libmod_svg.so -lib/synfig/modules/libmod_svg.la -lib/synfig/modules/libmod_example.so -lib/synfig/modules/libmod_example.la +lib/synfig/modules/libmod_yuv420p.so libdata/pkgconfig/synfig.pc %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -176,21 +157,21 @@ libdata/pkgconfig/synfig.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -share/locale/el/LC_MESSAGES/synfig.mo -share/locale/fa_IR/LC_MESSAGES/synfig.mo -share/locale/lt/LC_MESSAGES/synfig.mo -share/locale/nl/LC_MESSAGES/synfig.mo -share/locale/sk/LC_MESSAGES/synfig.mo share/locale/de/LC_MESSAGES/synfig.mo +share/locale/el/LC_MESSAGES/synfig.mo share/locale/en_GB/LC_MESSAGES/synfig.mo -share/locale/it/LC_MESSAGES/synfig.mo share/locale/es/LC_MESSAGES/synfig.mo +share/locale/fa_IR/LC_MESSAGES/synfig.mo share/locale/fr/LC_MESSAGES/synfig.mo +share/locale/it/LC_MESSAGES/synfig.mo +share/locale/lt/LC_MESSAGES/synfig.mo +share/locale/nl/LC_MESSAGES/synfig.mo share/locale/no/LC_MESSAGES/synfig.mo share/locale/pl/LC_MESSAGES/synfig.mo share/locale/pt_BR/LC_MESSAGES/synfig.mo share/locale/ro/LC_MESSAGES/synfig.mo share/locale/ru/LC_MESSAGES/synfig.mo +share/locale/sk/LC_MESSAGES/synfig.mo share/locale/zh_CN/LC_MESSAGES/synfig.mo %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/synfig/modules |