wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mlt: update to 6.6.0.

Browse source 
Closes: #11073 [via git-merge-pr]
This commit is contained in:
johannes 2018-01-25 18:18:21 +01:00 • committed by Jürgen Buchmüller
parent 27cd61adf1
commit 6865519938
4 changed files with 101 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
srcpkgs/mlt/patches/glibc-2.26.patch
View file

@ -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 <xlocale.h>
+# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
+# include <locale.h>
+# else
+# include <xlocale.h>
+# endif
#else
-typedef char* locale_t;
+#include <locale.h>
#endif

169
srcpkgs/mlt/patches/musl-locale.patch
View file

@ -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. 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_properties.c 2018-01-23 07:41:00.000000000 +0100
+++ src/framework/mlt_property.c 2017-01-20 21:38:19.680752910 +0100 +++ src/framework/mlt_properties.c 2018-01-25 17:49:25.604808390 +0100
@@ -278,27 +278,10 @@ @@ -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; s = copy;
pos = strrchr( s, ':' ); pos = strrchr( s, ':' );
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- char *orig_localename = NULL; - char *orig_localename = NULL;
- if ( locale ) - if ( locale )
- { - {
@ -33,7 +89,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
seconds = strtod( pos + 1, NULL ); seconds = strtod( pos + 1, NULL );
*pos = 0; *pos = 0;
pos = strrchr( s, ':' ); pos = strrchr( s, ':' );
@@ -312,23 +295,12 @@ @@ -312,23 +295,12 @@ static int time_clock_to_frames( mlt_pro
} }
} }
else { else {
@ -45,7 +101,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
seconds = strtod( s, NULL ); seconds = strtod( s, NULL );
} }
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- if ( locale ) { - if ( locale ) {
- // Restore the current locale - // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename ); - setlocale( LC_NUMERIC, orig_localename );
@ -56,8 +112,17 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
- -
free( copy ); free( copy );
return lrint( fps * ( (hours * 3600) + (minutes * 60) + seconds ) ); return floor( fps * hours * 3600 ) + floor( fps * minutes * 60 ) + lrint( fps * seconds );
@@ -489,37 +461,13 @@ @@ -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; char *end = NULL;
double result; double result;
@ -65,7 +130,7 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
if ( locale ) if ( locale )
result = strtod_l( value, &end, locale ); result = strtod_l( value, &end, locale );
else else
-#else -#elif !defined(_WIN32)
- char *orig_localename = NULL; - char *orig_localename = NULL;
- if ( locale ) { - if ( locale ) {
- // Protect damaging the global locale from a temporary locale on another thread. - // 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] == '%' ) if ( end && end[0] == '%' )
result /= 100.0; result /= 100.0;
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- if ( locale ) { - if ( locale ) {
- // Restore the current locale - // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename ); - setlocale( LC_NUMERIC, orig_localename );
@ -95,15 +160,17 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
return result; return result;
} }
} }
@@ -1027,35 +975,10 @@ @@ -1030,36 +978,11 @@ static int is_property_numeric( mlt_prop
{
double temp; double temp;
char *p = NULL; char *p = NULL;
-
-#if defined(__GLIBC__) || defined(__APPLE__) -#if defined(__GLIBC__) || defined(__APPLE__)
+
if ( locale ) if ( locale )
temp = strtod_l( self->prop_string, &p, locale ); temp = strtod_l( self->prop_string, &p, locale );
else else
-#else -#elif !defined(_WIN32)
- char *orig_localename = NULL; - char *orig_localename = NULL;
- if ( locale ) { - if ( locale ) {
- // Protect damaging the global locale from a temporary locale on another thread. - // 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 ); - temp = strtod( self->prop_string, &p );
- -
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- if ( locale ) { - if ( locale ) {
- // Restore the current locale - // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename ); - setlocale( LC_NUMERIC, orig_localename );
@ -128,15 +195,15 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
- } - }
-#endif -#endif
- -
+ temp = strtod( self->prop_string, &p ); + temp = strtod( self->prop_string, &p );
result = ( p != self->prop_string ); result = ( p != self->prop_string );
} }
return result; return result;
@@ -1531,28 +1454,12 @@ @@ -1535,28 +1458,12 @@ mlt_rect mlt_property_get_rect( mlt_prop
char *p = NULL; char *p = NULL;
int count = 0; int count = 0;
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- char *orig_localename = NULL; - char *orig_localename = NULL;
- if ( locale ) { - if ( locale ) {
- // Protect damaging the global locale from a temporary locale on another thread. - // 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 ); temp = strtod( value, &p );
if ( p != value ) if ( p != value )
{ {
@@ -1582,15 +1489,6 @@ @@ -1586,15 +1493,6 @@ mlt_rect mlt_property_get_rect( mlt_prop
value = p; value = p;
count ++; count ++;
} }
- -
-#if !defined(__GLIBC__) && !defined(__APPLE__) -#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32)
- if ( locale ) { - if ( locale ) {
- // Restore the current locale - // Restore the current locale
- setlocale( LC_NUMERIC, orig_localename ); - setlocale( LC_NUMERIC, orig_localename );
@ -177,58 +244,20 @@ Also don't assume locale_t == char* if __GLIBC__ isn't defined.
} }
return rect; 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 --- src/framework/mlt_property.h 2018-01-23 07:41:00.000000000 +0100
@@ -140,15 +140,9 @@ +++ src/framework/mlt_property.h 2018-01-25 18:01:15.393795679 +0100
{ @@ -30,13 +30,7 @@
property_list *list = self->local; #include <sys/param.h>
-#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";
#endif #endif
#if defined(_WIN32)
if ( result ) -#if defined(__GLIBC__) && !defined(__APPLE__)
@@ -714,12 +708,10 @@ # include <locale.h>
// Determine the value -#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
if ( isdigit( id[ 0 ] ) ) -# include <xlocale.h>
{
-#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 );
-#else -#else
- -typedef char* locale_t;
- free( list->locale );
-#endif -#endif
// Clear up the list extern mlt_property mlt_property_init( );
pthread_mutex_destroy( &list->mutex ); extern int mlt_property_set_int( mlt_property self, int value );

2
srcpkgs/mlt/patches/series
View file

@ -1,2 +0,0 @@
musl-locale.patch
glibc-2.26.patch

4
srcpkgs/mlt/template
View file

@ -1,6 +1,6 @@
# Template file for 'mlt' # Template file for 'mlt'
pkgname=mlt pkgname=mlt
version=6.4.1 version=6.6.0
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
@ -17,7 +17,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3" license="GPL-3"
homepage="http://mltframework.org/" homepage="http://mltframework.org/"
distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz"
checksum=87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382 checksum=11515546516b3c54719b6b402cacf46e8d5172450d6e9fe2655b237582490315
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
make_build_args="CROSS=${XBPS_CROSS_TRIPLET}-" make_build_args="CROSS=${XBPS_CROSS_TRIPLET}-"