From 83eb82e0082c613790cb5921d0bbdce6f5c9ff28 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Sun, 7 Jun 2026 05:10:38 +0000 Subject: [PATCH] Update synfigstudio and friends to 1.5.5 --- devel/etl/Makefile | 3 +- devel/etl/distinfo | 4 +-- multimedia/synfig/Makefile | 25 +++++++------- multimedia/synfig/distinfo | 4 +-- multimedia/synfig/pkg/PLIST | 3 ++ multimedia/synfigstudio/Makefile | 34 +++++++++---------- multimedia/synfigstudio/distinfo | 4 +-- .../patches/patch-src_gui_docks_dockbook_cpp | 14 ++++++++ multimedia/synfigstudio/pkg/PLIST | 8 +++++ 9 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 multimedia/synfigstudio/patches/patch-src_gui_docks_dockbook_cpp diff --git a/devel/etl/Makefile b/devel/etl/Makefile index 2e4c686307a..b8197e44fe7 100644 --- a/devel/etl/Makefile +++ b/devel/etl/Makefile @@ -1,9 +1,8 @@ COMMENT = C++ class and template library -V = 1.5.3 +V = 1.5.5 DISTNAME = ETL-${V} PKGNAME = etl-${V} -REVISION = 0 CATEGORIES = devel diff --git a/devel/etl/distinfo b/devel/etl/distinfo index 129807e609e..16af3c77d73 100644 --- a/devel/etl/distinfo +++ b/devel/etl/distinfo @@ -1,2 +1,2 @@ -SHA256 (ETL-1.5.3.tar.gz) = ZA9NLLzB+1gAKN6NI7UwYxwW4jQBjO/OM0aRcKQbBr8= -SIZE (ETL-1.5.3.tar.gz) = 256474 +SHA256 (ETL-1.5.5.tar.gz) = VwyJjxyXb6wwJoZtcY6j9I+LzhsjLtjL7cZZIcTjzCU= +SIZE (ETL-1.5.5.tar.gz) = 250039 diff --git a/multimedia/synfig/Makefile b/multimedia/synfig/Makefile index 2d9be2338a2..63255b56e28 100644 --- a/multimedia/synfig/Makefile +++ b/multimedia/synfig/Makefile @@ -3,10 +3,9 @@ BROKEN-powerpc64 = segfault in multi-threaded mode, synfigstudio can't be built COMMENT = 2D animation software -V= 1.5.3 +V= 1.5.5 DISTNAME = synfig-$V API_V = 1.0 -REVISION = 3 SHARED_LIBS += synfig 3.0 # 0.0 @@ -19,17 +18,17 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} ICE Iex-3_4 IlmThread-3_4 Imath-3_2 WANTLIB += Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16 OpenEXR-3_4 -WANTLIB += OpenEXRCore-3_4 OpenEXRUtil-3_4 SM X11 Xext Xt aom -WANTLIB += avcodec avformat avutil bz2 c crypto dav1d sharpyuv djvulibre -WANTLIB += expat ffi fftw3 fontconfig freetype fribidi gio-2.0 -WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 -WANTLIB += graphite2 gsm harfbuzz heif iconv intl jasper jbig -WANTLIB += jpeg lcms lcms2 ltdl lzma m mlt++-7 mlt-7 mng mp3lame -WANTLIB += ogg openjp2 opus pcre2-8 png raw_r sigc-2.0 speex ssl -WANTLIB += swresample swscale theoradec theoraenc tiff vorbis -WANTLIB += vorbisenc vpx webp webpdemux webpmux x264 x265 xcb -WANTLIB += xml++-2.6 xml2 xvidcore z deflate openjph -WANTLIB += X11-xcb Xfixes drm va va-drm va-x11 xcb-dri3 +WANTLIB += OpenEXRCore-3_4 OpenEXRUtil-3_4 SM SvtAv1Enc X11 X11-xcb +WANTLIB += Xext Xfixes Xt aom avcodec avformat avutil bz2 c crypto +WANTLIB += dav1d deflate djvulibre drm expat ffi fftw3 fontconfig +WANTLIB += freetype fribidi gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 +WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm harfbuzz heif +WANTLIB += iconv intl jbig jpeg lcms lcms2 ltdl lzma m mlt++-7 +WANTLIB += mlt-7 mng mp3lame mpg123 ogg openjp2 openjph opus pcre2-8 +WANTLIB += png raw_r sharpyuv sigc-2.0 speex ssl swresample swscale +WANTLIB += theoraenc tiff va va-drm va-x11 vorbis vorbisenc vpx +WANTLIB += webp webpdemux webpmux x264 x265 xcb xcb-dri3 xml++-2.6 +WANTLIB += xml2 xvidcore z SITES= https://github.com/synfig/synfig/releases/download/v${V}/ diff --git a/multimedia/synfig/distinfo b/multimedia/synfig/distinfo index 4c4caae6efd..aeba8882e35 100644 --- a/multimedia/synfig/distinfo +++ b/multimedia/synfig/distinfo @@ -1,2 +1,2 @@ -SHA256 (synfig-1.5.3.tar.gz) = kTyc7m5a2P1ts7NgfFta4DEvnuZyDGBhnjqX2phQHqg= -SIZE (synfig-1.5.3.tar.gz) = 4770774 +SHA256 (synfig-1.5.5.tar.gz) = lXg8kpJb2K5JTgD9qwNAyrqbGdKgqsmJ/YwgBDSybwY= +SIZE (synfig-1.5.5.tar.gz) = 5147691 diff --git a/multimedia/synfig/pkg/PLIST b/multimedia/synfig/pkg/PLIST index 977094c6529..d62d270314b 100644 --- a/multimedia/synfig/pkg/PLIST +++ b/multimedia/synfig/pkg/PLIST @@ -182,8 +182,10 @@ include/synfig-${API_V}/synfig/value.h include/synfig-${API_V}/synfig/valuenode.h include/synfig-${API_V}/synfig/valuenode_registry.h include/synfig-${API_V}/synfig/valuenodes/ +include/synfig-${API_V}/synfig/valuenodes/valuenode_absolute.h include/synfig-${API_V}/synfig/valuenodes/valuenode_add.h include/synfig-${API_V}/synfig/valuenodes/valuenode_and.h +include/synfig-${API_V}/synfig/valuenodes/valuenode_angle.h include/synfig-${API_V}/synfig/valuenodes/valuenode_anglestring.h include/synfig-${API_V}/synfig/valuenodes/valuenode_animated.h include/synfig-${API_V}/synfig/valuenodes/valuenode_animatedfile.h @@ -218,6 +220,7 @@ include/synfig-${API_V}/synfig/valuenodes/valuenode_intstring.h include/synfig-${API_V}/synfig/valuenodes/valuenode_join.h include/synfig-${API_V}/synfig/valuenodes/valuenode_linear.h include/synfig-${API_V}/synfig/valuenodes/valuenode_log.h +include/synfig-${API_V}/synfig/valuenodes/valuenode_maprange.h include/synfig-${API_V}/synfig/valuenodes/valuenode_modulo.h include/synfig-${API_V}/synfig/valuenodes/valuenode_not.h include/synfig-${API_V}/synfig/valuenodes/valuenode_or.h diff --git a/multimedia/synfigstudio/Makefile b/multimedia/synfigstudio/Makefile index 9c49941eb7f..63e260b956e 100644 --- a/multimedia/synfigstudio/Makefile +++ b/multimedia/synfigstudio/Makefile @@ -4,12 +4,11 @@ BROKEN-sparc64 = terminate called after throwing an instance of 'synfig::Excepti COMMENT = 2D animation software studio -V = 1.5.3 +V = 1.5.5 DISTNAME = synfigstudio-$V API_V = 0.0 -REVISION = 4 -SHARED_LIBS += synfigapp 3.0 # 0.0 +SHARED_LIBS += synfigapp 4.0 # 0.0 CATEGORIES = multimedia @@ -20,23 +19,23 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} ICE Iex-3_4 IlmThread-3_4 Imath-3_2 WANTLIB += Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16 OpenEXR-3_4 -WANTLIB += OpenEXRCore-3_4 OpenEXRUtil-3_4 SM X11 X11-xcb Xau -WANTLIB += Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender Xt aom atk-1.0 atk-bridge-2.0 atkmm-1.6 -WANTLIB += atspi avcodec avformat avutil bz2 c cairo cairo-gobject -WANTLIB += cairomm-1.0 crypto dav1d db dbus-1 deflate djvulibre -WANTLIB += drm epoll-shim epoxy expat ffi fftw3 fontconfig +WANTLIB += OpenEXRCore-3_4 OpenEXRUtil-3_4 SM SvtAv1Enc X11 X11-xcb +WANTLIB += XRes Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += Xi Xinerama Xrandr Xrender Xt aom atk-1.0 atk-bridge-2.0 +WANTLIB += atkmm-1.6 atspi avcodec avformat avutil bz2 c cairo +WANTLIB += cairo-gobject cairomm-1.0 crypto dav1d db dbus-1 deflate +WANTLIB += djvulibre drm epoll-shim epoxy expat ffi fftw3 fontconfig WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 WANTLIB += graphite2 gsm gtk-3 gtkmm-3.0 harfbuzz heif iconv intl -WANTLIB += jack jasper jbig jpeg lcms2 ltdl lzma m mlt++-7 mlt-7 -WANTLIB += mp3lame ogg openjp2 opus pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pangomm-1.4 pcre2-8 pixman-1 png raw_r sharpyuv sigc-2.0 -WANTLIB += speex ssl swresample swscale synfig theoradec theoraenc -WANTLIB += tiff va va-drm va-x11 vorbis vorbisenc vpx wayland-client -WANTLIB += wayland-cursor wayland-egl webp webpdemux webpmux x264 -WANTLIB += x265 xcb xcb-dri3 xcb-render xcb-shm xkbcommon xml++-2.6 -WANTLIB += xml2 xvidcore z openjph +WANTLIB += jack jbig jpeg lcms2 ltdl lzma m mlt++-7 mlt-7 mp3lame +WANTLIB += mpg123 ogg openjp2 openjph opus pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pangomm-1.4 pcre2-8 pixman-1 png raw_r +WANTLIB += sharpyuv sigc-2.0 speex ssl swresample swscale synfig +WANTLIB += theoraenc tiff va va-drm va-x11 vorbis vorbisenc vpx +WANTLIB += wayland-client wayland-cursor wayland-egl webp webpdemux +WANTLIB += webpmux x264 x265 xcb xcb-dri3 xcb-render xcb-shm xkbcommon +WANTLIB += xml++-2.6 xml2 xvidcore z SITES= https://github.com/synfig/synfig/releases/download/v${V}/ @@ -54,7 +53,6 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS = audio/jack \ databases/db/v4 \ - graphics/jasper \ graphics/libraw \ multimedia/synfig>=${V} \ x11/gtk3mm diff --git a/multimedia/synfigstudio/distinfo b/multimedia/synfigstudio/distinfo index d017c035b77..b2296c8daab 100644 --- a/multimedia/synfigstudio/distinfo +++ b/multimedia/synfigstudio/distinfo @@ -1,2 +1,2 @@ -SHA256 (synfigstudio-1.5.3.tar.gz) = f0MAOjbqC8kX5gt1RIASr8G46gf87gfMfoE6RIv3u+U= -SIZE (synfigstudio-1.5.3.tar.gz) = 6890107 +SHA256 (synfigstudio-1.5.5.tar.gz) = 57uYBqhuOX1G3+nzzJp0Q0lh78/qYRcTQmMCnBTnuyc= +SIZE (synfigstudio-1.5.5.tar.gz) = 6840912 diff --git a/multimedia/synfigstudio/patches/patch-src_gui_docks_dockbook_cpp b/multimedia/synfigstudio/patches/patch-src_gui_docks_dockbook_cpp new file mode 100644 index 00000000000..677a6226bbc --- /dev/null +++ b/multimedia/synfigstudio/patches/patch-src_gui_docks_dockbook_cpp @@ -0,0 +1,14 @@ +Fix segfault on OpenBSD. Do not touch the GTK page list during destruction. + +Index: src/gui/docks/dockbook.cpp +--- src/gui/docks/dockbook.cpp.orig ++++ src/gui/docks/dockbook.cpp +@@ -105,6 +105,8 @@ DockBook::~DockBook() + void + DockBook::clear() + { ++ if (deleting_) return; ++ + // here the point: get_n_pages is fails because this is not notebook type + // i didn't know why this happens, possibly because clear() is called from destructor + // and 'this' is already deleted. Or, this function maybe never work right. diff --git a/multimedia/synfigstudio/pkg/PLIST b/multimedia/synfigstudio/pkg/PLIST index 69c579f6187..24b4af0e60b 100644 --- a/multimedia/synfigstudio/pkg/PLIST +++ b/multimedia/synfigstudio/pkg/PLIST @@ -260,6 +260,7 @@ share/synfig/icons/classic/128x128/duck_width_icon.png share/synfig/icons/classic/128x128/duplicate_icon.png share/synfig/icons/classic/128x128/graphs_icon.png share/synfig/icons/classic/128x128/group_icon.png +share/synfig/icons/classic/128x128/hex_icon.png share/synfig/icons/classic/128x128/history_icon.png share/synfig/icons/classic/128x128/incr_resolution_icon.png share/synfig/icons/classic/128x128/info_icon.png @@ -332,6 +333,7 @@ share/synfig/icons/classic/128x128/layer_transform_rotate_icon.png share/synfig/icons/classic/128x128/layer_transform_scale_icon.png share/synfig/icons/classic/128x128/layer_transform_translate_icon.png share/synfig/icons/classic/128x128/library_icon.png +share/synfig/icons/classic/128x128/lower_bound_handle_icon.png share/synfig/icons/classic/128x128/meta_data_icon.png share/synfig/icons/classic/128x128/navigator_icon.png share/synfig/icons/classic/128x128/onion_skin_icon.png @@ -388,18 +390,23 @@ share/synfig/icons/classic/128x128/tool_text_icon.png share/synfig/icons/classic/128x128/tool_width_icon.png share/synfig/icons/classic/128x128/tool_zoom_icon.png share/synfig/icons/classic/128x128/type_angle_icon.png +share/synfig/icons/classic/128x128/type_bone_object_icon.png +share/synfig/icons/classic/128x128/type_bone_valuenode_icon.png share/synfig/icons/classic/128x128/type_bool_icon.png share/synfig/icons/classic/128x128/type_canvas_icon.png share/synfig/icons/classic/128x128/type_color_icon.png share/synfig/icons/classic/128x128/type_gradient_icon.png share/synfig/icons/classic/128x128/type_integer_icon.png share/synfig/icons/classic/128x128/type_list_icon.png +share/synfig/icons/classic/128x128/type_pair_bone_object_bone_object_icon.png share/synfig/icons/classic/128x128/type_real_icon.png share/synfig/icons/classic/128x128/type_segment_icon.png share/synfig/icons/classic/128x128/type_splinepoint_icon.png share/synfig/icons/classic/128x128/type_string_icon.png share/synfig/icons/classic/128x128/type_time_icon.png +share/synfig/icons/classic/128x128/type_transformation_icon.png share/synfig/icons/classic/128x128/type_vector_icon.png +share/synfig/icons/classic/128x128/upper_bound_handle_icon.png share/synfig/icons/classic/128x128/utils_chain_link_off_icon.png share/synfig/icons/classic/128x128/utils_chain_link_on_icon.png share/synfig/icons/classic/128x128/utils_timetrack_align_icon.png @@ -467,6 +474,7 @@ share/synfig/plugins/lottie-exporter/layers/scale_layer.py share/synfig/plugins/lottie-exporter/layers/shape.py share/synfig/plugins/lottie-exporter/layers/shape_solid.py share/synfig/plugins/lottie-exporter/layers/solid.py +share/synfig/plugins/lottie-exporter/layers/text.py share/synfig/plugins/lottie-exporter/layers/translate_layer.py share/synfig/plugins/lottie-exporter/lottie-exporter.py share/synfig/plugins/lottie-exporter/plugin.xml