Update mlt to the latest version 7.16.0. OK?
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index ceb50aaa0ea..5ec74fcb9b5 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,11 +1,9 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 7.12.0
+VERSION = 7.16.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = mlt7-${VERSION}
PKGNAME-gpl2 = mlt7-gpl2-${VERSION}
-REVISION-gpl2 = 0
-REVISION-main = 0
CATEGORIES = multimedia devel
@@ -17,8 +15,8 @@ MASTER_SITES = \
DEBUG_PACKAGES = ${BUILD_PACKAGES}
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt-7 4.0
-SHARED_LIBS += mlt++-7 4.0
+SHARED_LIBS = mlt-7 4.1
+SHARED_LIBS += mlt++-7 4.1
# GPLv2+, LGPLv2.1+
# Actually, qimage module could be under GPLv3+ if one more object
@@ -32,7 +30,8 @@ WANTLIB-main += m pango-1.0 pangoft2-1.0 sox swresample
swscale vorbis
WANTLIB-main += vorbisfile xml2
WANTLIB-gpl2 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB-gpl2 += Qt5Xml exif m mlt++-7 mlt-7 pulse pulse-simple samplerate
+WANTLIB-gpl2 += Qt5Xml exif fftw3 m mlt++-7 mlt-7 pulse pulse-simple
+WANTLIB-gpl2 += samplerate vidstab
MULTI_PACKAGES = -main -gpl2
@@ -63,6 +62,8 @@ LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
audio/libsamplerate \
audio/pulseaudio \
graphics/libexif \
+ math/fftw3 \
+ multimedia/libvidstab \
x11/qt5/qtsvg
CONFIGURE_ARGS = -DMOD_RUBBERBAND=OFF
diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo
index ec4bf6ad28c..cfd787e40bc 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-7.12.0.tar.gz) = SLOF6Dy9W/aL/IhjEnOGj77jakGzt+Ks2X8SsJWwCDw=
-SIZE (mlt-7.12.0.tar.gz) = 1481720
+SHA256 (mlt-7.16.0.tar.gz) = wJdeBkA9PfIr59S12W0GCODRZHApk2DQoO5fQborepY=
+SIZE (mlt-7.16.0.tar.gz) = 1577046
diff --git a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
index 35d4e497fe3..a5f4e41f0d2 100644
--- a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
+++ b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
@@ -6,157 +6,93 @@ locale functions from dumping core!
Index: src/framework/mlt_property.c
--- src/framework/mlt_property.c.orig
+++ src/framework/mlt_property.c
-@@ -321,7 +321,7 @@ static int time_clock_to_frames( mlt_property self, co
- s = copy;
- pos = strrchr( s, ':' );
+@@ -318,7 +318,7 @@ static int time_clock_to_frames(mlt_property self, con
+ s = copy;
+ pos = strrchr(s, ':');
-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- char *orig_localename = NULL;
- if ( locale )
- {
-@@ -337,7 +337,7 @@ static int time_clock_to_frames( mlt_property self, co
+ char *orig_localename = NULL;
+ if (locale) {
+ // Protect damaging the global locale from a temporary locale on
another thread.
+@@ -333,7 +333,7 @@ static int time_clock_to_frames(mlt_property self, con
#endif
- if ( pos ) {
+ if (pos) {
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
- if ( locale )
- seconds = strtod_l( pos + 1, NULL, locale );
- else
-@@ -355,7 +355,7 @@ static int time_clock_to_frames( mlt_property self, co
- }
- }
- else {
+ if (locale)
+ seconds = strtod_l(pos + 1, NULL, locale);
+ else
+@@ -349,7 +349,7 @@ static int time_clock_to_frames(mlt_property self, con
+ minutes = atoi(s);
+ }
+ } else {
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
- if ( locale )
- seconds = strtod_l( s, NULL, locale );
- else
-@@ -363,7 +363,7 @@ static int time_clock_to_frames( mlt_property self, co
- seconds = strtod( s, NULL );
- }
+ if (locale)
+ seconds = strtod_l(s, NULL, locale);
+ else
+@@ -357,7 +357,7 @@ static int time_clock_to_frames(mlt_property self, con
+ seconds = strtod(s, NULL);
+ }
-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- if ( locale ) {
- // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename );
-@@ -540,11 +540,11 @@ static double mlt_property_atof( mlt_property self, do
- char *end = NULL;
- double result;
+ if (locale) {
+ // Restore the current locale
+ setlocale(LC_NUMERIC, orig_localename);
+@@ -521,7 +521,7 @@ static double mlt_property_atof(mlt_property self, dou
+ char *end = NULL;
+ double result;
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
- if ( locale )
- result = strtod_l( value, &end, locale );
- else
--#elif !defined(_WIN32)
-+#elif !defined(_WIN32) && !defined(__OpenBSD__)
- char *orig_localename = NULL;
- if ( locale ) {
- // Protect damaging the global locale from a temporary
locale on another thread.
-@@ -562,7 +562,7 @@ static double mlt_property_atof( mlt_property self, do
- if ( end && end[0] == '%' )
- result /= 100.0;
+ if (locale)
+ result = strtod_l(value, &end, locale);
+ else
+@@ -543,7 +543,7 @@ static double mlt_property_atof(mlt_property self, dou
+ if (end && end[0] == '%')
+ result /= 100.0;
-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- if ( locale ) {
- // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename );
-@@ -812,7 +812,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
- }
- else if ( ! ( self->types & mlt_prop_string ) )
- {
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__OpenBSD__)
- // TODO: when glibc gets sprintf_l, start using it! For now,
hack on setlocale.
- // Save the current locale
- #if defined(__APPLE__)
-@@ -865,7 +865,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
- self->types |= mlt_prop_string;
- self->prop_string = self->serialiser( self->data,
self->length );
- }
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__OpenBSD__)
- // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename );
- free( orig_localename );
-@@ -1103,7 +1103,7 @@ static void time_clock_from_frames( int frames, double
-
- char *mlt_property_get_time( mlt_property self, mlt_time_format format,
double fps, locale_t locale )
- {
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__OpenBSD__)
- char *orig_localename = NULL;
- #endif
- int frames = 0;
-@@ -1116,7 +1116,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
- if ( format == mlt_time_frames )
- return mlt_property_get_string_l( self, locale );
-
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__OpenBSD__)
- // Use the specified locale
- if ( locale )
- {
-@@ -1175,7 +1175,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
- else // Use smpte drop frame by default
- time_smpte_from_frames( frames, fps, self->prop_string, 1 );
-
--#if !defined(_WIN32)
-+#if !defined(_WIN32) && !defined(__OpenBSD__)
- // Restore the current locale
- if ( locale )
- {
-@@ -1216,11 +1216,11 @@ static int is_property_numeric( mlt_property self, loc
- {
- char *p = NULL;
+ if (locale) {
+ // Restore the current locale
+ setlocale(LC_NUMERIC, orig_localename);
+@@ -1152,7 +1152,7 @@ static int is_property_numeric(mlt_property self, mlt_
+ if ((!result && self->types & mlt_prop_string) && self->prop_string) {
+ char *p = NULL;
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
- if ( locale )
- strtod_l( self->prop_string, &p, locale );
- else
--#elif !defined(_WIN32)
-+#elif !defined(_WIN32) && !defined(__OpenBSD__)
- char *orig_localename = NULL;
- if ( locale ) {
- // Protect damaging the global locale from a temporary
locale on another thread.
-@@ -1236,7 +1236,7 @@ static int is_property_numeric( mlt_property self, loc
+ if (locale)
+ strtod_l(self->prop_string, &p, locale);
+ else
+@@ -1172,7 +1172,7 @@ static int is_property_numeric(mlt_property self, mlt_
- strtod( self->prop_string, &p );
+ strtod(self->prop_string, &p);
-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- if ( locale ) {
- // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename );
-@@ -1930,7 +1930,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
- char *p = NULL;
- int count = 0;
+ if (locale) {
+ // Restore the current locale
+ setlocale(LC_NUMERIC, orig_localename);
+@@ -1901,7 +1901,7 @@ mlt_rect mlt_property_get_rect(mlt_property self, mlt_
--#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
-+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- char *orig_localename = NULL;
- if ( locale ) {
- // Protect damaging the global locale from a temporary
locale on another thread.
-@@ -1947,7 +1947,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
- while ( *value )
- {
- double temp;
+ while (*value) {
+ double temp;
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
- if ( locale )
- temp = strtod_l( value, &p, locale );
- else
-@@ -1982,7 +1982,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
- count ++;
- }
+ if (locale)
+ temp = strtod_l(value, &p, locale);
+ else
+@@ -1942,7 +1942,7 @@ mlt_rect mlt_property_get_rect(mlt_property self, mlt_
+ count++;
+ }
-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L)
+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) &&
!defined(HAVE_STRTOD_L) && !defined(__OpenBSD__)
- if ( locale ) {
- // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename );
+ if (locale) {
+ // Restore the current locale
+ setlocale(LC_NUMERIC, orig_localename);
diff --git
a/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
b/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
index 8ebbe96b790..8db244714bc 100644
---
a/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
+++
b/multimedia/mlt7/patches/patch-src_tests_test_properties_test_properties_cpp
@@ -6,6 +6,6 @@ Index: src/tests/test_properties/test_properties.cpp
extern "C" {
-#define __APPLE__
- #include <framework/mlt_property.h>
#include <framework/mlt_animation.h>
+ #include <framework/mlt_property.h>
}
diff --git a/multimedia/mlt7/pkg/PLIST-main b/multimedia/mlt7/pkg/PLIST-main
index ad853f8fcfc..0ac0cd9a42f 100644
--- a/multimedia/mlt7/pkg/PLIST-main
+++ b/multimedia/mlt7/pkg/PLIST-main
@@ -92,9 +92,16 @@ share/mlt-7/
share/mlt-7/avformat/
share/mlt-7/avformat/blacklist.txt
share/mlt-7/avformat/consumer_avformat.yml
+share/mlt-7/avformat/filter_avcolour_space.yml
+share/mlt-7/avformat/filter_avdeinterlace.yml
+share/mlt-7/avformat/filter_swresample.yml
+share/mlt-7/avformat/filter_swscale.yml
+share/mlt-7/avformat/link_avdeinterlace.yml
+share/mlt-7/avformat/link_swresample.yml
share/mlt-7/avformat/producer_avformat.yml
share/mlt-7/avformat/resolution_scale.yml
share/mlt-7/avformat/yuv_only.txt
+share/mlt-7/chain_normalizers.ini
share/mlt-7/core/
share/mlt-7/core/consumer_multi.yml
share/mlt-7/core/filter_audiomap.yml
@@ -125,6 +132,7 @@ share/mlt-7/core/loader.ini
share/mlt-7/core/producer_colour.yml
share/mlt-7/core/producer_consumer.yml
share/mlt-7/core/producer_hold.yml
+share/mlt-7/core/producer_loader-nogl.yml
share/mlt-7/core/producer_loader.yml
share/mlt-7/core/producer_melt.yml
share/mlt-7/core/producer_melt_file.yml
@@ -315,6 +323,15 @@ share/mlt-7/presets/consumer/avformat/stills/PPM
share/mlt-7/presets/consumer/avformat/stills/TGA
share/mlt-7/presets/consumer/avformat/stills/TIFF
share/mlt-7/presets/consumer/avformat/stills/webp
+share/mlt-7/presets/consumer/avformat/ten_bit/
+share/mlt-7/presets/consumer/avformat/ten_bit/AV1
+share/mlt-7/presets/consumer/avformat/ten_bit/DNxHR-HQ
+share/mlt-7/presets/consumer/avformat/ten_bit/FFV1
+share/mlt-7/presets/consumer/avformat/ten_bit/ProRes 422
+share/mlt-7/presets/consumer/avformat/ten_bit/ProRes 444
+share/mlt-7/presets/consumer/avformat/ten_bit/ProRes HQ
+share/mlt-7/presets/consumer/avformat/ten_bit/x264-high10
+share/mlt-7/presets/consumer/avformat/ten_bit/x265-main10
share/mlt-7/presets/consumer/avformat/vp9
share/mlt-7/presets/consumer/avformat/webm
share/mlt-7/presets/consumer/avformat/webm-pass1
@@ -419,6 +436,7 @@ share/mlt-7/profiles/vertical_hd_30
share/mlt-7/profiles/vertical_hd_60
share/mlt-7/qt/filter_gpsgraphic.yml
share/mlt-7/qt/filter_gpstext.yml
+share/mlt-7/resample/link_resample.yml
share/mlt-7/sdl/
share/mlt-7/sdl/consumer_sdl.yml
share/mlt-7/sdl/consumer_sdl_audio.yml
@@ -432,6 +450,9 @@ share/mlt-7/sox/filter_sox.yml
share/mlt-7/sox/filter_sox_effect.yml
share/mlt-7/vorbis/
share/mlt-7/vorbis/producer_vorbis.yml
+share/mlt-7/xine/
+share/mlt-7/xine/filter_deinterlace.yml
+share/mlt-7/xine/link_deinterlace.yml
share/mlt-7/xml/
share/mlt-7/xml/consumer_xml.yml
share/mlt-7/xml/mlt-xml.dtd
