Wednesday, August 17, 2022

UPDATE: devel/etl multimedia/synfig multimedia/synfigstudio

I would like to get rid of multimedia/mlt. This needs a synfig update to
the latest greatest version. synfigstudio runs fine I painted same
simple cycles and stars.

Cheers,

Artist rsadowski(tm)

Index: devel/etl/Makefile
===================================================================
RCS file: /cvs/ports/devel/etl/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/etl/Makefile 11 Mar 2022 18:50:01 -0000 1.9
+++ devel/etl/Makefile 17 Aug 2022 14:14:55 -0000
@@ -1,7 +1,6 @@
COMMENT = C++ class and template library

-V = 1.2.1
-REVISION = 0
+V = 1.5.1
DISTNAME = ETL-${V}
PKGNAME = etl-${V}

Index: devel/etl/distinfo
===================================================================
RCS file: /cvs/ports/devel/etl/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/etl/distinfo 7 Dec 2017 22:41:51 -0000 1.4
+++ devel/etl/distinfo 17 Aug 2022 14:14:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (ETL-1.2.1.tar.gz) = dU2Ixd3971TyfR4X9iqQLrnwn75++a697TRUG0wXAOY=
-SIZE (ETL-1.2.1.tar.gz) = 373906
+SHA256 (ETL-1.5.1.tar.gz) = ElwE8YkvKF/rwvnMBvky93COPJ+Uw6MATNGAMZcZe0o=
+SIZE (ETL-1.5.1.tar.gz) = 295899
Index: devel/etl/patches/patch-ETL__pen_h
===================================================================
RCS file: devel/etl/patches/patch-ETL__pen_h
diff -N devel/etl/patches/patch-ETL__pen_h
--- devel/etl/patches/patch-ETL__pen_h 11 Mar 2022 18:50:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-Unbreak consumers on !clang archs, from:
-https://github.com/synfig/synfig/commit/cb05b072fe6fffb4433140c631f422bdbc036722
-
-Index: ETL/_pen.h
---- ETL/_pen.h.orig
-+++ ETL/_pen.h
-@@ -136,7 +136,8 @@ class generic_pen (public)
- typedef int value_type;
- value_type x,y;
- difference_type(value_type x, value_type y):x(x),y(y) { }
-- value_type &operator[](int i)const { return i?y:x; }
-+ const value_type &operator[](int i) const { return i?y:x; }
-+ value_type &operator[](int i) { return i?y:x; }
- };
-
- protected:
Index: devel/etl/patches/patch-ETL__stringf_h
===================================================================
RCS file: devel/etl/patches/patch-ETL__stringf_h
diff -N devel/etl/patches/patch-ETL__stringf_h
--- devel/etl/patches/patch-ETL__stringf_h 11 Mar 2022 18:50:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: ETL/_stringf.h
---- 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()
Index: devel/etl/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/etl/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/etl/pkg/PLIST 11 Mar 2022 18:50:01 -0000 1.3
+++ devel/etl/pkg/PLIST 17 Aug 2022 14:14:55 -0000
@@ -1,68 +1,37 @@
bin/ETL-config
include/ETL/
-include/ETL/_angle.h
-include/ETL/_bezier.h
-include/ETL/_bezier_angle.h
-include/ETL/_boxblur.h
-include/ETL/_bspline.h
-include/ETL/_calculus.h
-include/ETL/_clock_base.h
-include/ETL/_clock_gettimeofday.h
-include/ETL/_clock_system.h
-include/ETL/_clock_win32hpcount.h
-include/ETL/_condition.h
-include/ETL/_curve.h
-include/ETL/_curve_func.h
-include/ETL/_fastangle.h
-include/ETL/_fastangle_tables.h
-include/ETL/_fixed.h
-include/ETL/_gaussian.h
-include/ETL/_handle.h
-include/ETL/_hermite.h
-include/ETL/_misc.h
-include/ETL/_mutex_null.h
-include/ETL/_mutex_pthreads.h
-include/ETL/_mutex_pthreads_simple.h
-include/ETL/_mutex_win32.h
-include/ETL/_pen.h
-include/ETL/_random.h
-include/ETL/_rect.h
-include/ETL/_ref_count.h
-include/ETL/_rwlock.h
-include/ETL/_smach.h
-include/ETL/_smart_ptr.h
-include/ETL/_status.h
-include/ETL/_stringf.h
-include/ETL/_surface.h
-include/ETL/_thread.h
-include/ETL/_trivial.h
-include/ETL/_value.h
-include/ETL/angle
-include/ETL/bezier
-include/ETL/boxblur
-include/ETL/calculus
-include/ETL/clock
-include/ETL/etl_config.h
-include/ETL/etl_profile.h
-include/ETL/fastangle
-include/ETL/fixed
-include/ETL/gaussian
-include/ETL/handle
-include/ETL/hermite
-include/ETL/ipc
-include/ETL/misc
-include/ETL/mutex
-include/ETL/pen
-include/ETL/random
-include/ETL/rect
-include/ETL/ref_count
-include/ETL/smach
-include/ETL/smart_ptr
-include/ETL/spline
-include/ETL/status
-include/ETL/stringf
-include/ETL/surface
-include/ETL/thread
-include/ETL/trivial
-include/ETL/value
+include/ETL/ETL/
+include/ETL/ETL/_angle.h
+include/ETL/ETL/_bezier.h
+include/ETL/ETL/_bezier_angle.h
+include/ETL/ETL/_boxblur.h
+include/ETL/ETL/_calculus.h
+include/ETL/ETL/_curve_func.h
+include/ETL/ETL/_fixed.h
+include/ETL/ETL/_gaussian.h
+include/ETL/ETL/_handle.h
+include/ETL/ETL/_hermite.h
+include/ETL/ETL/_misc.h
+include/ETL/ETL/_pen.h
+include/ETL/ETL/_ref_count.h
+include/ETL/ETL/_smart_ptr.h
+include/ETL/ETL/_stringf.h
+include/ETL/ETL/_surface.h
+include/ETL/ETL/angle
+include/ETL/ETL/bezier
+include/ETL/ETL/boxblur
+include/ETL/ETL/calculus
+include/ETL/ETL/clock
+include/ETL/ETL/etl_config.h
+include/ETL/ETL/etl_profile.h
+include/ETL/ETL/fixed
+include/ETL/ETL/gaussian
+include/ETL/ETL/handle
+include/ETL/ETL/hermite
+include/ETL/ETL/misc
+include/ETL/ETL/pen
+include/ETL/ETL/ref_count
+include/ETL/ETL/smart_ptr
+include/ETL/ETL/stringf
+include/ETL/ETL/surface
lib/pkgconfig/ETL.pc
Index: multimedia/synfig/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/synfig/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- multimedia/synfig/Makefile 31 Mar 2022 16:45:26 -0000 1.37
+++ multimedia/synfig/Makefile 17 Aug 2022 14:14:55 -0000
@@ -3,10 +3,9 @@ BROKEN-powerpc64 = segfault in multi-thr

COMMENT = 2D animation software

-V= 1.2.1
+V= 1.5.1
DISTNAME = synfig-$V
API_V = 1.0
-REVISION = 9

SHARED_LIBS += synfig 2.0 # 0.0

@@ -17,19 +16,18 @@ HOMEPAGE = https://www.synfig.org/
# GPLv2+
PERMIT_PACKAGE = Yes

-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += ICE Iex-3_1 OpenEXR-3_1 OpenEXRCore-3_1 OpenEXRUtil-3_1
-WANTLIB += IlmThread-3_1 Imath-3_1 Magick++-6.Q16 MagickCore-6.Q16
-WANTLIB += MagickWand-6.Q16 SM X11 Xext Xrender Xt aom boost_chrono-mt
-WANTLIB += boost_filesystem boost_program_options-mt boost_system
-WANTLIB += bz2 c cairo dav1d de265 djvulibre 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 harfbuzz heif iconv
-WANTLIB += intl jasper jbig jpeg lcms lcms2 ltdl lzma m mlt mlt++
-WANTLIB += mng openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB += pixman-1 png raw_r sigc-2.0 tiff webp webpdemux webpmux
-WANTLIB += x265 xcb xcb-render xcb-shm xml++-2.6 xml2 z zstd
-WANTLIB += Xau Xdmcp
+WANTLIB += ${COMPILER_LIBCXX} ICE Iex-3_1 IlmThread-3_1 Imath-3_1
+WANTLIB += Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16 OpenEXR-3_1
+WANTLIB += OpenEXRCore-3_1 OpenEXRUtil-3_1 SM X11 Xext Xt aom
+WANTLIB += avcodec avformat avutil bz2 c crypto dav1d de265 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 pcre 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 zstd

MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synfig/}

@@ -38,13 +36,12 @@ COMPILER = base-clang ports-gcc

MODULES = textproc/intltool

-BUILD_DEPENDS = devel/etl>=1.2.1 \
+BUILD_DEPENDS = devel/boost \
+ devel/etl>=${V} \
devel/gettext,-tools

LIB_DEPENDS = archivers/xz \
- devel/boost \
devel/libtool,-ltdl \
- devel/pango \
graphics/ImageMagick \
graphics/jasper \
graphics/libmng \
@@ -52,7 +49,7 @@ LIB_DEPENDS = archivers/xz \
graphics/openexr \
graphics/png \
multimedia/aom \
- multimedia/mlt \
+ multimedia/mlt7 \
textproc/libxml++

USE_GMAKE = Yes
Index: multimedia/synfig/distinfo
===================================================================
RCS file: /cvs/ports/multimedia/synfig/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- multimedia/synfig/distinfo 7 Dec 2017 22:42:50 -0000 1.3
+++ multimedia/synfig/distinfo 17 Aug 2022 14:14:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (synfig-1.2.1.tar.gz) = TYutpOmfBe4WtCVvw/WlUdAKdFNHlEg3u9b6FYtX5Fc=
-SIZE (synfig-1.2.1.tar.gz) = 4913740
+SHA256 (synfig-1.5.1.tar.gz) = qpFZPCionyab4b6ci9nsymSR+eavJnRNHBYMZVPuLO0=
+SIZE (synfig-1.5.1.tar.gz) = 4988207
Index: multimedia/synfig/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/synfig/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- multimedia/synfig/patches/patch-configure_ac 11 Mar 2022 19:39:28 -0000 1.3
+++ multimedia/synfig/patches/patch-configure_ac 17 Aug 2022 14:14:55 -0000
@@ -3,7 +3,7 @@ Don't override CXXFLAGS optimisation lev
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -47,7 +47,6 @@ AC_C_BIGENDIAN
+@@ -46,7 +46,6 @@ AC_C_BIGENDIAN

# -- A R G U M E N T S ----------------------------------------

Index: multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
===================================================================
RCS file: multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
diff -N multimedia/synfig/patches/patch-src_synfig_filesystem_cpp
--- multimedia/synfig/patches/patch-src_synfig_filesystem_cpp 11 Mar 2022 19:39:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Fix segfaults during the build of multimedia/synfigstudio, from
-https://github.com/synfig/synfig/issues/822
-
-Index: src/synfig/filesystem.cpp
---- src/synfig/filesystem.cpp.orig
-+++ src/synfig/filesystem.cpp
-@@ -181,7 +181,7 @@ String FileSystem::fix_slashes(const String &filename)
- {
- String fixed = etl::cleanup_path(filename);
- if (fixed == ".") fixed = "";
-- for(size_t i = 0; i < filename.size(); ++i)
-+ for(size_t i = 0; i < fixed.size(); ++i)
- if (fixed[i] == '\\') fixed[i] = '/';
- return fixed;
- }
Index: multimedia/synfig/patches/patch-src_synfig_transform_cpp
===================================================================
RCS file: multimedia/synfig/patches/patch-src_synfig_transform_cpp
diff -N multimedia/synfig/patches/patch-src_synfig_transform_cpp
--- multimedia/synfig/patches/patch-src_synfig_transform_cpp 11 Mar 2022 19:39:28 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: src/synfig/transform.cpp
---- src/synfig/transform.cpp.orig
-+++ src/synfig/transform.cpp
-@@ -29,6 +29,7 @@
- # include <config.h>
-

No comments:

Post a Comment