Re: [UPDATE] multimedia/mlt

On Sun Mar 07, 2021 at 02:50:10PM +0100, Marc Espie wrote:
> This makes use of the libebur128 port I posted a few hours ago
> I've had most of this in my dir for a while, I actually got stumped on
> something stupid in shotcut.
>
> I've built and used shotcut with this without issue. I've also built
> kdenlive, but I'm not too familiar with it.
>
> Highlights:
> - uses external libebur
> - fix loads of warnings with clang (these patches haven been sent as
> Issue to upstream)
>
> Please test/okay
>

New diff to the latest version 6.26.

I would like to import mlt 7.0 to update x11/kde-applications/kdenlive.
And I would propose we import 7.0 as a new port multimedia/mlt7 and we enable
GPLv2/GPLv3 in one port?

Feedback welcome.


diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 1903c469e0b..e13e72ec8ed 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -2,15 +2,14 @@

COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.22.1
+VERSION = 6.26.1
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION = 0

# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 3.2
-SHARED_LIBS += mlt++ 3.2
+SHARED_LIBS = mlt 4.0
+SHARED_LIBS += mlt++ 4.0

CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
@@ -22,13 +21,13 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
PERMIT_PACKAGE = Yes

WANTLIB-main += ${COMPILER_LIBCXX} SDL SDL2 SDL_image X11 avcodec avdevice
-WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig gdk-x11-2.0
+WANTLIB-main += avfilter avformat avutil c ebur128 exif fftw3 fontconfig
WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
-WANTLIB-main += pangoft2-1.0 sox swresample swscale vorbisfile xml2
-WANTLIB-main += ebur128
+WANTLIB-main += pangoft2-1.0 sox swresample swscale vidstab vorbisfile
+WANTLIB-main += xml2

-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
+WANTLIB-gpl2 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
+WANTLIB-gpl2 += Qt5Xml SDL2 m mlt samplerate

MASTER_SITES = https://github.com/mltframework/mlt/releases/download/v${VERSION}/

@@ -52,7 +51,7 @@ LIB_DEPENDS-main = audio/jack \
graphics/ffmpeg \
graphics/libexif \
math/fftw3 \
- x11/gtk+2,-main
+ devel/pango

LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
${MODQT5_LIB_DEPENDS} \
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index f9099be4a49..6fe3f8a191c 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.22.1.tar.gz) = o9698LiBHw0gyQLMPfPQXa19P/NtHbFsCnM40NWYmZg=
-SIZE (mlt-6.22.1.tar.gz) = 1343746
+SHA256 (mlt-6.26.1.tar.gz) = ikhLu/UfM+JTEnV1MfOtLOIGBxSdIPz8tAo8HmCyC04=
+SIZE (mlt-6.26.1.tar.gz) = 1366022
diff --git a/multimedia/mlt/patches/patch-src_framework_mlt_property_c b/multimedia/mlt/patches/patch-src_framework_mlt_property_c
index 8df07befa6a..ff334c0c83c 100644
--- a/multimedia/mlt/patches/patch-src_framework_mlt_property_c
+++ b/multimedia/mlt/patches/patch-src_framework_mlt_property_c
@@ -7,22 +7,7 @@ locale functions from dumping core!
Index: src/framework/mlt_property.c
--- src/framework/mlt_property.c.orig
+++ src/framework/mlt_property.c
-@@ -90,8 +90,12 @@ struct mlt_property_s
- mlt_property mlt_property_init( )
- {
- mlt_property self = calloc( 1, sizeof( *self ) );
-- if ( self )
-- pthread_mutex_init( &self->mutex, NULL );
-+ if ( self ) {
-+ pthread_mutexattr_t attr;
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init( &self->mutex, &attr );
-+ }
- return self;
- }
-
-@@ -311,7 +315,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -315,7 +315,7 @@ static int time_clock_to_frames( mlt_property self, co
s = copy;
pos = strrchr( s, ':' );

@@ -31,7 +16,25 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale )
{
-@@ -353,7 +357,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -331,7 +331,7 @@ static int time_clock_to_frames( mlt_property self, co
+