git: c484be0f2e08 - main - graphics/synfig: Update to 1.4.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 23 Apr 2022 19:37:13 UTC
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=c484be0f2e085c534aa6be8a2394a46b464a33f0 commit c484be0f2e085c534aa6be8a2394a46b464a33f0 Author: Chris Hutchinson <portmaster@bsdforge.com> AuthorDate: 2022-04-23 19:36:01 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-04-23 19:37:11 +0000 graphics/synfig: Update to 1.4.2 PR: 263461 --- graphics/synfig/Makefile | 4 +- graphics/synfig/distinfo | 6 +- graphics/synfig/files/patch-src__synfig__main.cpp | 33 ++-- .../synfig/files/patch-src__synfig__transform.cpp | 4 +- graphics/synfig/pkg-plist | 172 +++++++++------------ 5 files changed, 93 insertions(+), 126 deletions(-) diff --git a/graphics/synfig/Makefile b/graphics/synfig/Makefile index 824216bdfb1b..729a99fb0a7d 100644 --- a/graphics/synfig/Makefile +++ b/graphics/synfig/Makefile @@ -1,9 +1,8 @@ # Created by: Yinghong.Liu <relaxbsd@gmail.com> PORTNAME= synfig -PORTVERSION= 1.2.2 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX=v -PORTREVISION= 19 CATEGORIES= graphics devel multimedia MAINTAINER= portmaster@BSDforge.com @@ -21,6 +20,7 @@ LIB_DEPENDS= libImath.so:math/Imath \ libfftw3.so:math/fftw3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libltdl.so:devel/libltdl \ libmng.so:graphics/libmng \ libpng.so:graphics/png \ diff --git a/graphics/synfig/distinfo b/graphics/synfig/distinfo index dcf287e9b77a..8b628f0f47be 100644 --- a/graphics/synfig/distinfo +++ b/graphics/synfig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1576020568 -SHA256 (synfig-synfig-v1.2.2_GH0.tar.gz) = 7319e9ad62f3ae3e4c25875ac4965f3ecf72b96d8d435b42c91dcd6dd9b0e82d -SIZE (synfig-synfig-v1.2.2_GH0.tar.gz) = 11107386 +TIMESTAMP = 1647569275 +SHA256 (synfig-synfig-v1.4.2_GH0.tar.gz) = f435e51a425541cbbe752b0cb6052fe1f05f9da977cccf0ee3a0ef95c4b7c84b +SIZE (synfig-synfig-v1.4.2_GH0.tar.gz) = 12844618 diff --git a/graphics/synfig/files/patch-src__synfig__main.cpp b/graphics/synfig/files/patch-src__synfig__main.cpp index 397e68956e17..07691b5d7942 100644 --- a/graphics/synfig/files/patch-src__synfig__main.cpp +++ b/graphics/synfig/files/patch-src__synfig__main.cpp @@ -1,6 +1,6 @@ ---- src/synfig/main.cpp.orig 2017-04-02 22:19:06 UTC -+++ src/synfig/main.cpp -@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String& basepath,Prog +--- src/synfig/main.cpp.orig 2022-04-20 18:01:09.451858000 -0700 ++++ src/synfig/main.cpp 2022-04-20 19:15:23.316538000 -0700 +@@ -224,7 +224,7 @@ unsigned int i; #ifdef _DEBUG @@ -9,35 +9,34 @@ std::set_terminate(__gnu_cxx::__verbose_terminate_handler); #endif #endif -@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fallback_path) - +@@ -546,7 +546,11 @@ /* Read from /proc/self/exe (symlink) */ - char* path2 = (char*)malloc(buf_size); + //char* path2 = (char*)malloc(buf_size); + char* path2 = new char[buf_size]; +- strncpy(path2, "/proc/self/exe", buf_size - 1); +#if defined(__FreeBSD__) || defined (__DragonFly__) -+ strncpy(path2, "/proc/curproc/file", buf_size - 1); ++ strncpy(path2, "/proc/curproc/file", buf_size - 1); +#else - strncpy(path2, "/proc/self/exe", buf_size - 1); ++ strncpy(path2, "/proc/self/exe", buf_size - 1); +#endif while (1) { int i; -@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fallback_path) - /* path is a symlink. Continue loop and resolve this. */ - strncpy(path, path2, buf_size - 1); - } -- -+ - free(path2); +@@ -584,6 +588,7 @@ + //free(path2); + delete[] path2; +#if ! (defined(__FreeBSD__) || defined(__DragonFly__)) if (result == "") { /* readlink() or stat() failed; this can happen when the program is -@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fallback_path) +@@ -625,7 +630,8 @@ free(line); fclose(f); } +- +#endif - ++ free(path); + #endif diff --git a/graphics/synfig/files/patch-src__synfig__transform.cpp b/graphics/synfig/files/patch-src__synfig__transform.cpp index 49f5cec3b5d7..2885f0c74400 100644 --- a/graphics/synfig/files/patch-src__synfig__transform.cpp +++ b/graphics/synfig/files/patch-src__synfig__transform.cpp @@ -1,5 +1,5 @@ ---- src/synfig/transform.cpp.orig 2015-03-28 10:15:01 UTC -+++ src/synfig/transform.cpp +--- src/synfig/transform.cpp.orig 2022-04-20 19:16:57.130395000 -0700 ++++ src/synfig/transform.cpp 2022-04-20 19:17:00.690569000 -0700 @@ -31,6 +31,7 @@ #include "transform.h" diff --git a/graphics/synfig/pkg-plist b/graphics/synfig/pkg-plist index eeb8dca5b027..b0609863bcce 100644 --- a/graphics/synfig/pkg-plist +++ b/graphics/synfig/pkg-plist @@ -1,6 +1,6 @@ bin/synfig bin/synfig-config -etc/synfig_modules.cfg +%%ETCDIR%%_modules.cfg include/synfig-1.0/synfig/activepoint.h include/synfig-1.0/synfig/angle.h include/synfig-1.0/synfig/base_types.h @@ -23,9 +23,11 @@ include/synfig-1.0/synfig/color/color.hpp include/synfig-1.0/synfig/color/coloraccumulator.h include/synfig-1.0/synfig/color/colormatrix.h include/synfig-1.0/synfig/color/common.h +include/synfig-1.0/synfig/color/gamma.h include/synfig-1.0/synfig/color/pixelformat.h include/synfig-1.0/synfig/complex.h include/synfig-1.0/synfig/context.h +include/synfig-1.0/synfig/curve.h include/synfig-1.0/synfig/curve_helper.h include/synfig-1.0/synfig/curveset.h include/synfig-1.0/synfig/dashitem.h @@ -40,7 +42,6 @@ include/synfig-1.0/synfig/filesystem.h include/synfig-1.0/synfig/filesystemgroup.h include/synfig-1.0/synfig/filesystemnative.h include/synfig-1.0/synfig/filesystemtemporary.h -include/synfig-1.0/synfig/gamma.h include/synfig-1.0/synfig/general.h include/synfig-1.0/synfig/gradient.h include/synfig-1.0/synfig/guid.h @@ -73,9 +74,7 @@ include/synfig-1.0/synfig/loadcanvas.h include/synfig-1.0/synfig/localization.h include/synfig-1.0/synfig/main.h include/synfig-1.0/synfig/matrix.h -include/synfig-1.0/synfig/mesh.h include/synfig-1.0/synfig/module.h -include/synfig-1.0/synfig/mutex.h include/synfig-1.0/synfig/node.h include/synfig-1.0/synfig/pair.h include/synfig-1.0/synfig/palette.h @@ -91,54 +90,31 @@ include/synfig-1.0/synfig/releases.h include/synfig-1.0/synfig/renddesc.h include/synfig-1.0/synfig/render.h include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendassociative.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendblend.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendcomposite.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendseparate.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendsplit.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendzero.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizercalcbounds.h +include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendmerge.h +include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendtotarget.h include/synfig-1.0/synfig/rendering/common/optimizer/optimizerdraft.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlinear.h include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlist.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizerpixelprocessorsplit.h +include/synfig-1.0/synfig/rendering/common/optimizer/optimizerpass.h include/synfig-1.0/synfig/rendering/common/optimizer/optimizersplit.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurface.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfaceconvert.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfacecreate.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfacedestroy.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfaceresample.h include/synfig-1.0/synfig/rendering/common/optimizer/optimizertransformation.h -include/synfig-1.0/synfig/rendering/common/optimizer/optimizertransformationaffine.h +include/synfig-1.0/synfig/rendering/common/surfacefile.h include/synfig-1.0/synfig/rendering/common/surfacememoryreadwrapper.h include/synfig-1.0/synfig/rendering/common/task/taskblend.h include/synfig-1.0/synfig/rendering/common/task/taskblur.h -include/synfig-1.0/synfig/rendering/common/task/taskcallback.h -include/synfig-1.0/synfig/rendering/common/task/taskcomposite.h include/synfig-1.0/synfig/rendering/common/task/taskcontour.h include/synfig-1.0/synfig/rendering/common/task/tasklayer.h -include/synfig-1.0/synfig/rendering/common/task/tasklist.h include/synfig-1.0/synfig/rendering/common/task/taskmesh.h -include/synfig-1.0/synfig/rendering/common/task/taskpixelcolormatrix.h -include/synfig-1.0/synfig/rendering/common/task/taskpixelgamma.h include/synfig-1.0/synfig/rendering/common/task/taskpixelprocessor.h -include/synfig-1.0/synfig/rendering/common/task/tasksolid.h -include/synfig-1.0/synfig/rendering/common/task/tasksplittable.h -include/synfig-1.0/synfig/rendering/common/task/tasksurface.h -include/synfig-1.0/synfig/rendering/common/task/tasksurfaceconvert.h -include/synfig-1.0/synfig/rendering/common/task/tasksurfacecreate.h -include/synfig-1.0/synfig/rendering/common/task/tasksurfacedestroy.h -include/synfig-1.0/synfig/rendering/common/task/tasksurfaceempty.h -include/synfig-1.0/synfig/rendering/common/task/tasksurfaceresample.h -include/synfig-1.0/synfig/rendering/common/task/tasktransformableaffine.h include/synfig-1.0/synfig/rendering/common/task/tasktransformation.h -include/synfig-1.0/synfig/rendering/common/task/tasktransformationpass.h include/synfig-1.0/synfig/rendering/optimizer.h -include/synfig-1.0/synfig/rendering/primitive/affinetransformation.h +include/synfig-1.0/synfig/rendering/primitive/bend.h include/synfig-1.0/synfig/rendering/primitive/blur.h include/synfig-1.0/synfig/rendering/primitive/contour.h +include/synfig-1.0/synfig/rendering/primitive/intersector.h include/synfig-1.0/synfig/rendering/primitive/mesh.h include/synfig-1.0/synfig/rendering/primitive/polyspan.h include/synfig-1.0/synfig/rendering/primitive/transformation.h +include/synfig-1.0/synfig/rendering/primitive/transformationaffine.h include/synfig-1.0/synfig/rendering/renderer.h include/synfig-1.0/synfig/rendering/renderqueue.h include/synfig-1.0/synfig/rendering/resource.h @@ -147,40 +123,25 @@ include/synfig-1.0/synfig/rendering/software/function/blur.h include/synfig-1.0/synfig/rendering/software/function/blurtemplates.h include/synfig-1.0/synfig/rendering/software/function/contour.h include/synfig-1.0/synfig/rendering/software/function/fft.h +include/synfig-1.0/synfig/rendering/software/function/mesh.h include/synfig-1.0/synfig/rendering/software/function/packedsurface.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizerblendsw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizerblursw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizercontoursw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizerlayersw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizermeshsw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelcolormatrixsw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelgammasw.h -include/synfig-1.0/synfig/rendering/software/optimizer/optimizersurfaceresamplesw.h +include/synfig-1.0/synfig/rendering/software/function/resample.h include/synfig-1.0/synfig/rendering/software/rendererdraftsw.h include/synfig-1.0/synfig/rendering/software/rendererlowressw.h +include/synfig-1.0/synfig/rendering/software/rendererpreviewsw.h include/synfig-1.0/synfig/rendering/software/renderersafe.h include/synfig-1.0/synfig/rendering/software/renderersw.h include/synfig-1.0/synfig/rendering/software/surfacesw.h include/synfig-1.0/synfig/rendering/software/surfaceswpacked.h -include/synfig-1.0/synfig/rendering/software/task/taskblendsw.h -include/synfig-1.0/synfig/rendering/software/task/taskblursw.h -include/synfig-1.0/synfig/rendering/software/task/taskcontoursw.h -include/synfig-1.0/synfig/rendering/software/task/taskexpandsurfacesw.h -include/synfig-1.0/synfig/rendering/software/task/tasklayersw.h -include/synfig-1.0/synfig/rendering/software/task/taskmeshsw.h -include/synfig-1.0/synfig/rendering/software/task/taskpixelcolormatrixsw.h -include/synfig-1.0/synfig/rendering/software/task/taskpixelgammasw.h -include/synfig-1.0/synfig/rendering/software/task/tasksurfaceresamplesw.h include/synfig-1.0/synfig/rendering/software/task/tasksw.h include/synfig-1.0/synfig/rendering/surface.h include/synfig-1.0/synfig/rendering/task.h -include/synfig-1.0/synfig/rendermethod.h include/synfig-1.0/synfig/savecanvas.h include/synfig-1.0/synfig/segment.h include/synfig-1.0/synfig/smartfile.h include/synfig-1.0/synfig/soundprocessor.h include/synfig-1.0/synfig/string.h -include/synfig-1.0/synfig/string_decl.h +include/synfig-1.0/synfig/string_helper.h include/synfig-1.0/synfig/surface.h include/synfig-1.0/synfig/target.h include/synfig-1.0/synfig/target_cairo.h @@ -191,8 +152,10 @@ include/synfig-1.0/synfig/target_null_tile.h include/synfig-1.0/synfig/target_scanline.h include/synfig-1.0/synfig/target_tile.h include/synfig-1.0/synfig/targetparam.h +include/synfig-1.0/synfig/threadpool.h include/synfig-1.0/synfig/time.h include/synfig-1.0/synfig/timepointcollect.h +include/synfig-1.0/synfig/token.h include/synfig-1.0/synfig/transform.h include/synfig-1.0/synfig/transformation.h include/synfig-1.0/synfig/type.h @@ -290,6 +253,7 @@ lib/synfig/modules/libmod_gif.so lib/synfig/modules/libmod_gradient.so lib/synfig/modules/libmod_imagemagick.so lib/synfig/modules/libmod_jpeg.so +lib/synfig/modules/libmod_libavcodec.so lib/synfig/modules/libmod_magickpp.so lib/synfig/modules/libmod_mng.so lib/synfig/modules/libmod_noise.so @@ -304,52 +268,56 @@ libdata/pkgconfig/synfig.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -%%NLS%%share/locale/aa_DJ/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ar/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/bs/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ca/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ca@valencia/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/cs/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/cs_CZ/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/da/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/de/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/el_GR/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/en_CZ/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/es/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/es_PY/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/eu/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/eu_ES/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/fa_IR/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/fr/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/gl/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/he/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/hi_IN/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/hu/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/it/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ja/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ja_JP/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/kab/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/lt/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/lv/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ne/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/nl/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/no_NO/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/pl_PL/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/pt/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ro/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ru/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/si/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/sk/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/sk_SK/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/sl/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/sr_RS/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/sv_SE/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/tr/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/ur/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/uz@Latn/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/zh-Hant/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/synfig.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/synfig.mo +share/locale/aa_DJ/LC_MESSAGES/synfig.mo +share/locale/ar/LC_MESSAGES/synfig.mo +share/locale/bs/LC_MESSAGES/synfig.mo +share/locale/ca/LC_MESSAGES/synfig.mo +share/locale/ca@valencia/LC_MESSAGES/synfig.mo +share/locale/cs/LC_MESSAGES/synfig.mo +share/locale/cs_CZ/LC_MESSAGES/synfig.mo +share/locale/da/LC_MESSAGES/synfig.mo +share/locale/de/LC_MESSAGES/synfig.mo +share/locale/el_GR/LC_MESSAGES/synfig.mo +share/locale/en_CZ/LC_MESSAGES/synfig.mo +share/locale/en_GB/LC_MESSAGES/synfig.mo +share/locale/es/LC_MESSAGES/synfig.mo +share/locale/es_AR/LC_MESSAGES/synfig.mo +share/locale/es_PY/LC_MESSAGES/synfig.mo +share/locale/eu/LC_MESSAGES/synfig.mo +share/locale/eu_ES/LC_MESSAGES/synfig.mo +share/locale/fa_IR/LC_MESSAGES/synfig.mo +share/locale/fr/LC_MESSAGES/synfig.mo +share/locale/gl/LC_MESSAGES/synfig.mo +share/locale/he/LC_MESSAGES/synfig.mo +share/locale/hi/LC_MESSAGES/synfig.mo +share/locale/hi_IN/LC_MESSAGES/synfig.mo +share/locale/hu/LC_MESSAGES/synfig.mo +share/locale/it/LC_MESSAGES/synfig.mo +share/locale/ja/LC_MESSAGES/synfig.mo +share/locale/ja_JP/LC_MESSAGES/synfig.mo +share/locale/kab/LC_MESSAGES/synfig.mo +share/locale/ko_KR/LC_MESSAGES/synfig.mo +share/locale/lt/LC_MESSAGES/synfig.mo +share/locale/lv/LC_MESSAGES/synfig.mo +share/locale/nb/LC_MESSAGES/synfig.mo +share/locale/ne/LC_MESSAGES/synfig.mo +share/locale/nl/LC_MESSAGES/synfig.mo +share/locale/pl_PL/LC_MESSAGES/synfig.mo +share/locale/pt/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/si/LC_MESSAGES/synfig.mo +share/locale/sk/LC_MESSAGES/synfig.mo +share/locale/sk_SK/LC_MESSAGES/synfig.mo +share/locale/sl/LC_MESSAGES/synfig.mo +share/locale/sr_RS/LC_MESSAGES/synfig.mo +share/locale/sv_SE/LC_MESSAGES/synfig.mo +share/locale/tr/LC_MESSAGES/synfig.mo +share/locale/uk/LC_MESSAGES/synfig.mo +share/locale/ur/LC_MESSAGES/synfig.mo +share/locale/uz@Latn/LC_MESSAGES/synfig.mo +share/locale/zh-Hant/LC_MESSAGES/synfig.mo +share/locale/zh_CN/LC_MESSAGES/synfig.mo +share/locale/zh_TW.Big5/LC_MESSAGES/synfig.mo +share/locale/zh_TW/LC_MESSAGES/synfig.mo