Update mlt7 to 7.12.0. I need 7.12 to update KDE.
All consumers build without any issues.
OK?
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index efc5793d3b8..ffc92c97c28 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.8.0
+VERSION = 7.12.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 3.0
-SHARED_LIBS += mlt++-7 3.0
+SHARED_LIBS = mlt-7 4.0
+SHARED_LIBS += mlt++-7 4.0
# GPLv2+, LGPLv2.1+
# Actually, qimage module could be under GPLv3+ if one more object
diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo
index ccf7c81ec41..ec4bf6ad28c 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-7.8.0.tar.gz) = ZmBtefkbQApNk4CpEaXXcaSL1kE0R/ovNxNFnrpwJC0=
-SIZE (mlt-7.8.0.tar.gz) = 1458730
+SHA256 (mlt-7.12.0.tar.gz) = SLOF6Dy9W/aL/IhjEnOGj77jakGzt+Ks2X8SsJWwCDw=
+SIZE (mlt-7.12.0.tar.gz) = 1481720
diff --git a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
index 383eb810523..35d4e497fe3 100644
--- a/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
+++ b/multimedia/mlt7/patches/patch-src_framework_mlt_property_c
@@ -6,7 +6,7 @@ locale functions from dumping core!
Index: src/framework/mlt_property.c
--- src/framework/mlt_property.c.orig
+++ src/framework/mlt_property.c
-@@ -320,7 +320,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -321,7 +321,7 @@ static int time_clock_to_frames( mlt_property self, co
s = copy;
pos = strrchr( s, ':' );
@@ -15,7 +15,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale )
{
-@@ -336,7 +336,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -337,7 +337,7 @@ static int time_clock_to_frames( mlt_property self, co
#endif
if ( pos ) {
@@ -24,7 +24,7 @@ Index: src/framework/mlt_property.c
if ( locale )
seconds = strtod_l( pos + 1, NULL, locale );
else
-@@ -354,7 +354,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -355,7 +355,7 @@ static int time_clock_to_frames( mlt_property self, co
}
}
else {
@@ -33,7 +33,7 @@ Index: src/framework/mlt_property.c
if ( locale )
seconds = strtod_l( s, NULL, locale );
else
-@@ -362,7 +362,7 @@ static int time_clock_to_frames( mlt_property self, co
+@@ -363,7 +363,7 @@ static int time_clock_to_frames( mlt_property self, co
seconds = strtod( s, NULL );
}
@@ -42,7 +42,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
-@@ -539,11 +539,11 @@ static double mlt_property_atof( mlt_property self, do
+@@ -540,11 +540,11 @@ static double mlt_property_atof( mlt_property self, do
char *end = NULL;
double result;
@@ -56,7 +56,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale ) {
// Protect damaging the global locale from a temporary
locale on another thread.
-@@ -561,7 +561,7 @@ static double mlt_property_atof( mlt_property self, do
+@@ -562,7 +562,7 @@ static double mlt_property_atof( mlt_property self, do
if ( end && end[0] == '%' )
result /= 100.0;
@@ -65,7 +65,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
-@@ -804,7 +804,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
+@@ -812,7 +812,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
}
else if ( ! ( self->types & mlt_prop_string ) )
{
@@ -74,7 +74,7 @@ Index: src/framework/mlt_property.c
// TODO: when glibc gets sprintf_l, start using it! For now,
hack on setlocale.
// Save the current locale
#if defined(__APPLE__)
-@@ -850,7 +850,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
+@@ -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 );
}
@@ -83,7 +83,7 @@ Index: src/framework/mlt_property.c
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
free( orig_localename );
-@@ -1062,7 +1062,7 @@ static void time_clock_from_frames( int frames, double
+@@ -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 )
{
@@ -92,7 +92,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
#endif
int frames = 0;
-@@ -1075,7 +1075,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
+@@ -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 );
@@ -101,7 +101,7 @@ Index: src/framework/mlt_property.c
// Use the specified locale
if ( locale )
{
-@@ -1134,7 +1134,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
+@@ -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 );
@@ -110,7 +110,7 @@ Index: src/framework/mlt_property.c
// Restore the current locale
if ( locale )
{
-@@ -1174,11 +1174,11 @@ static int is_property_numeric( mlt_property self, loc
+@@ -1216,11 +1216,11 @@ static int is_property_numeric( mlt_property self, loc
{
char *p = NULL;
@@ -124,7 +124,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale ) {
// Protect damaging the global locale from a temporary
locale on another thread.
-@@ -1194,7 +1194,7 @@ static int is_property_numeric( mlt_property self, loc
+@@ -1236,7 +1236,7 @@ static int is_property_numeric( mlt_property self, loc
strtod( self->prop_string, &p );
@@ -133,7 +133,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
-@@ -1688,7 +1688,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
+@@ -1930,7 +1930,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
char *p = NULL;
int count = 0;
@@ -142,7 +142,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale ) {
// Protect damaging the global locale from a temporary
locale on another thread.
-@@ -1705,7 +1705,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
+@@ -1947,7 +1947,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
while ( *value )
{
double temp;
@@ -150,8 +150,8 @@ Index: src/framework/mlt_property.c
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(HAVE_STRTOD_L) &&
!defined(__OpenBSD__)
if ( locale )
temp = strtod_l( value, &p, locale );
- else
-@@ -1740,7 +1740,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
+ else
+@@ -1982,7 +1982,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
count ++;
}
diff --git a/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
b/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
index e8a19cf55f2..a8f75ec1af5 100644
--- a/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
+++ b/multimedia/mlt7/patches/patch-src_modules_plusgpl_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: src/modules/plusgpl/CMakeLists.txt
--- src/modules/plusgpl/CMakeLists.txt.orig
+++ src/modules/plusgpl/CMakeLists.txt
-@@ -16,7 +16,7 @@ target_link_libraries(mltplusgpl PRIVATE mlt m Threads
+@@ -21,7 +21,7 @@ target_link_libraries(mltplusgpl PRIVATE mlt m Threads
if(WIN32)
target_link_libraries(mltplusgpl PRIVATE ws2_32)
diff --git a/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
b/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
index 47245dc8504..3cdc93db87c 100644
--- a/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
+++ b/multimedia/mlt7/patches/patch-src_modules_sdl_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: src/modules/sdl/CMakeLists.txt
--- src/modules/sdl/CMakeLists.txt.orig
+++ src/modules/sdl/CMakeLists.txt
-@@ -14,6 +14,7 @@ if(APPLE)
+@@ -19,6 +19,7 @@ if(APPLE)
target_link_libraries(mltsdl PRIVATE objc "-framework Foundation")
elseif(UNIX)
target_link_libraries(mltsdl PRIVATE X11)
diff --git a/multimedia/mlt7/pkg/PLIST-main b/multimedia/mlt7/pkg/PLIST-main
index 58b1903a4e2..ad853f8fcfc 100644
--- a/multimedia/mlt7/pkg/PLIST-main
+++ b/multimedia/mlt7/pkg/PLIST-main
@@ -417,6 +417,8 @@ share/mlt-7/profiles/vcd_ntsc
share/mlt-7/profiles/vcd_pal
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/sdl/
share/mlt-7/sdl/consumer_sdl.yml
share/mlt-7/sdl/consumer_sdl_audio.yml
@@ -432,7 +434,6 @@ share/mlt-7/vorbis/
share/mlt-7/vorbis/producer_vorbis.yml
share/mlt-7/xml/
share/mlt-7/xml/consumer_xml.yml
-share/mlt-7/xml/filter_gpstext.yml
share/mlt-7/xml/mlt-xml.dtd
share/mlt-7/xml/producer_xml-nogl.yml
share/mlt-7/xml/producer_xml-string.yml
