diff --git a/srcpkgs/mlt/patches/glibc-2.26.patch b/srcpkgs/mlt/patches/glibc-2.26.patch deleted file mode 100644 index e8a2c0da710..00000000000 --- a/srcpkgs/mlt/patches/glibc-2.26.patch +++ /dev/null @@ -1,23 +0,0 @@ - -xlocale.h is deprecated and not available in glibc-2.26 - -on musl there is locale.h, too - - ---- src/framework/mlt_property.h.orig 2017-08-30 13:55:55.676748750 +0200 -+++ src/framework/mlt_property.h 2017-08-30 13:59:27.660276105 +0200 -@@ -31,7 +31,11 @@ - #endif - - #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) --#include -+# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__) -+# include -+# else -+# include -+# endif - #else --typedef char* locale_t; -+#include - #endif - diff --git a/srcpkgs/mlt/patches/musl-locale.patch b/srcpkgs/mlt/patches/musl-locale.patch index ef79573405c..a53df96d03d 100644 --- a/srcpkgs/mlt/patches/musl-locale.patch +++ b/srcpkgs/mlt/patches/musl-locale.patch @@ -3,13 +3,69 @@ then strtod_l() would not exist. It exists with musl libc as well. Also don't assume locale_t == char* if __GLIBC__ isn't defined. ---- src/framework/mlt_property.c 2017-01-20 21:18:26.246774282 +0100 -+++ src/framework/mlt_property.c 2017-01-20 21:38:19.680752910 +0100 -@@ -278,27 +278,10 @@ +--- src/framework/mlt_properties.c 2018-01-23 07:41:00.000000000 +0100 ++++ src/framework/mlt_properties.c 2018-01-25 17:49:25.604808390 +0100 +@@ -141,15 +141,9 @@ int mlt_properties_set_lcnumeric( mlt_pr + { + property_list *list = self->local; + +-#if defined(__GLIBC__) || defined(__APPLE__) + if ( list->locale ) + freelocale( list->locale ); + list->locale = newlocale( LC_NUMERIC_MASK, locale, NULL ); +-#else +- +- free( list->locale ); +- list->locale = strdup( locale ); +-#endif + } + else + error = 1; +@@ -181,7 +175,7 @@ const char* mlt_properties_get_lcnumeric + #elif defined(__GLIBC__) + result = list->locale->__names[ LC_NUMERIC ]; + #else +- result = list->locale; ++ result = "C"; + #endif + #if defined(_WIN32) + if ( result ) +@@ -713,12 +707,10 @@ int mlt_properties_set( mlt_properties s + // Determine the value + if ( isdigit( id[ 0 ] ) ) + { +-#if defined(__GLIBC__) || defined(__APPLE__) + property_list *list = self->local; + if ( list->locale ) + current = strtod_l( id, NULL, list->locale ); + else +-#endif + current = strtod( id, NULL ); + } + else +@@ -1404,14 +1396,9 @@ void mlt_properties_close( mlt_propertie + free( list->name[ index ] ); + } + +-#if defined(__GLIBC__) || defined(__APPLE__) + // Cleanup locale + if ( list->locale ) + freelocale( list->locale ); +-#else +- +- free( list->locale ); +-#endif + + // Clear up the list + pthread_mutex_destroy( &list->mutex ); + +--- src/framework/mlt_property.c 2018-01-23 07:41:00.000000000 +0100 ++++ src/framework/mlt_property.c 2018-01-25 17:45:17.343812836 +0100 +@@ -278,27 +278,10 @@ static int time_clock_to_frames( mlt_pro s = copy; pos = strrchr( s, ':' ); --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - char *orig_localename = NULL; - if ( locale ) - { @@ -33,7 +89,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. seconds = strtod( pos + 1, NULL ); *pos = 0; pos = strrchr( s, ':' ); -@@ -312,23 +295,12 @@ +@@ -312,23 +295,12 @@ static int time_clock_to_frames( mlt_pro } } else { @@ -45,7 +101,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. seconds = strtod( s, NULL ); } --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - if ( locale ) { - // Restore the current locale - setlocale( LC_NUMERIC, orig_localename ); @@ -56,8 +112,17 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. - free( copy ); - return lrint( fps * ( (hours * 3600) + (minutes * 60) + seconds ) ); -@@ -489,37 +461,13 @@ + return floor( fps * hours * 3600 ) + floor( fps * minutes * 60 ) + lrint( fps * seconds ); +@@ -407,7 +379,7 @@ static int time_code_to_frames( mlt_prop + static int mlt_property_atoi( mlt_property self, double fps, locale_t locale ) + { + const char *value = self->prop_string; +- ++ + // Parse a hex color value as #RRGGBB or #AARRGGBB. + if ( value[0] == '#' ) + { +@@ -489,37 +461,13 @@ static double mlt_property_atof( mlt_pro char *end = NULL; double result; @@ -65,7 +130,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. if ( locale ) result = strtod_l( value, &end, locale ); else --#else +-#elif !defined(_WIN32) - char *orig_localename = NULL; - if ( locale ) { - // Protect damaging the global locale from a temporary locale on another thread. @@ -83,7 +148,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. if ( end && end[0] == '%' ) result /= 100.0; --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - if ( locale ) { - // Restore the current locale - setlocale( LC_NUMERIC, orig_localename ); @@ -95,15 +160,17 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. return result; } } -@@ -1027,35 +975,10 @@ +@@ -1030,36 +978,11 @@ static int is_property_numeric( mlt_prop + { double temp; char *p = NULL; - +- -#if defined(__GLIBC__) || defined(__APPLE__) ++ if ( locale ) temp = strtod_l( self->prop_string, &p, locale ); else --#else +-#elif !defined(_WIN32) - char *orig_localename = NULL; - if ( locale ) { - // Protect damaging the global locale from a temporary locale on another thread. @@ -119,7 +186,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. - - temp = strtod( self->prop_string, &p ); - --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - if ( locale ) { - // Restore the current locale - setlocale( LC_NUMERIC, orig_localename ); @@ -128,15 +195,15 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. - } -#endif - -+ temp = strtod( self->prop_string, &p ); ++ temp = strtod( self->prop_string, &p ); result = ( p != self->prop_string ); } return result; -@@ -1531,28 +1454,12 @@ +@@ -1535,28 +1458,12 @@ mlt_rect mlt_property_get_rect( mlt_prop char *p = NULL; int count = 0; --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - char *orig_localename = NULL; - if ( locale ) { - // Protect damaging the global locale from a temporary locale on another thread. @@ -161,12 +228,12 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. temp = strtod( value, &p ); if ( p != value ) { -@@ -1582,15 +1489,6 @@ +@@ -1586,15 +1493,6 @@ mlt_rect mlt_property_get_rect( mlt_prop value = p; count ++; } - --#if !defined(__GLIBC__) && !defined(__APPLE__) +-#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) - if ( locale ) { - // Restore the current locale - setlocale( LC_NUMERIC, orig_localename ); @@ -177,58 +244,20 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined. } return rect; } ---- src/framework/mlt_properties.c 2017-01-20 21:18:26.246774282 +0100 -+++ src/framework/mlt_properties.c 2017-01-20 21:38:19.679752910 +0100 -@@ -140,15 +140,9 @@ - { - property_list *list = self->local; - --#if defined(__GLIBC__) || defined(__APPLE__) - if ( list->locale ) - freelocale( list->locale ); - list->locale = newlocale( LC_NUMERIC_MASK, locale, NULL ); --#else -- -- free( list->locale ); -- list->locale = strdup( locale ); --#endif - } - else - error = 1; -@@ -178,7 +172,7 @@ - #elif defined(__GLIBC__) - result = list->locale->__names[ LC_NUMERIC ]; - #else -- result = list->locale; -+ result = "C"; + +--- src/framework/mlt_property.h 2018-01-23 07:41:00.000000000 +0100 ++++ src/framework/mlt_property.h 2018-01-25 18:01:15.393795679 +0100 +@@ -30,13 +30,7 @@ + #include #endif - #if defined(_WIN32) - if ( result ) -@@ -714,12 +708,10 @@ - // Determine the value - if ( isdigit( id[ 0 ] ) ) - { --#if defined(__GLIBC__) || defined(__APPLE__) - property_list *list = self->local; - if ( list->locale ) - current = strtod_l( id, NULL, list->locale ); - else --#endif - current = strtod( id, NULL ); - } - else -@@ -1410,14 +1402,9 @@ - free( list->name[ index ] ); - } - --#if defined(__GLIBC__) || defined(__APPLE__) - // Cleanup locale - if ( list->locale ) - freelocale( list->locale ); + +-#if defined(__GLIBC__) && !defined(__APPLE__) + # include +-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506) +-# include -#else -- -- free( list->locale ); +-typedef char* locale_t; -#endif - // Clear up the list - pthread_mutex_destroy( &list->mutex ); + extern mlt_property mlt_property_init( ); + extern int mlt_property_set_int( mlt_property self, int value ); diff --git a/srcpkgs/mlt/patches/series b/srcpkgs/mlt/patches/series deleted file mode 100644 index 4fb1d73e1d8..00000000000 --- a/srcpkgs/mlt/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -musl-locale.patch -glibc-2.26.patch diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 167633e68d9..b60a4816a8f 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,6 +1,6 @@ # Template file for 'mlt' pkgname=mlt -version=6.4.1 +version=6.6.0 revision=1 build_style=gnu-configure configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde @@ -17,7 +17,7 @@ maintainer="Diogo Leal " license="GPL-3" homepage="http://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382 +checksum=11515546516b3c54719b6b402cacf46e8d5172450d6e9fe2655b237582490315 if [ -n "$CROSS_BUILD" ]; then make_build_args="CROSS=${XBPS_CROSS_TRIPLET}-"