cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mlt to 6.22.1

Browse Source 
Drop me as maintainer.

ok tracey@
This commit is contained in:
rsadowski 2020-08-24 14:09:54 +00:00
parent b6f376d9cf
commit 4f7220f9b2
8 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/mlt/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.26 2020/05/20 09:17:03 espie Exp $
# $OpenBSD: Makefile,v 1.27 2020/08/24 14:09:54 rsadowski Exp $
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
VERSION = 6.20.0
VERSION = 6.22.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
@ -16,8 +15,6 @@ CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# GPLv2+, LGPLv2.1+
# Actually, qimage module could be under GPLv3+ if one more object
# file gets included, see --enable-gpl3 configure option.

4
multimedia/mlt/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mlt-6.20.0.tar.gz) = qyEeJ8BsBoj5y+LXTcBiNiTvdepPlO6pFc3DExlr4t0=
SIZE (mlt-6.20.0.tar.gz) = 1446137
SHA256 (mlt-6.22.1.tar.gz) = o9698LiBHw0gyQLMPfPQXa19P/NtHbFsCnM40NWYmZg=
SIZE (mlt-6.22.1.tar.gz) = 1343746

6
multimedia/mlt/patches/patch-src_framework_Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_framework_Makefile,v 1.4 2020/05/18 10:33:17 espie Exp $
$OpenBSD: patch-src_framework_Makefile,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
Index: src/framework/Makefile
--- src/framework/Makefile.orig
+++ src/framework/Makefile
@ -20,7 +20,7 @@ Index: src/framework/Makefile
else
NAME = libmlt$(LIBSUF)
TARGET = $(NAME).$(version)
@@ -98,10 +100,12 @@ all: $(TARGET)
@@ -100,10 +102,12 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@ -36,7 +36,7 @@ Index: src/framework/Makefile
depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -123,6 +127,8 @@ install:
@@ -125,6 +129,8 @@ install:
install -m 755 $(TARGET) "$(DESTDIR)$(bindir)/libmlt.dll" ; \
fi; \
install -m 644 libmlt.def "$(DESTDIR)$(libdir)" ; \

28
multimedia/mlt/patches/patch-src_framework_mlt_property_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_framework_mlt_property_c,v 1.3 2020/05/20 09:17:04 espie Exp $
$OpenBSD: patch-src_framework_mlt_property_c,v 1.4 2020/08/24 14:09:54 rsadowski Exp $
note: if/when OpenBSD gets LC_NUMERIC locale support, the code should be
revisited to use threads locale functions (see uselocale(3)), because a
mutex is not enough to prevent unsupported usage of non thread-safe
@ -22,7 +22,7 @@ Index: src/framework/mlt_property.c
return self;
}
@@ -292,7 +296,7 @@ static int time_clock_to_frames( mlt_property self, co
@@ -311,7 +315,7 @@ static int time_clock_to_frames( mlt_property self, co
s = copy;
pos = strrchr( s, ':' );
@ -31,7 +31,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
if ( locale )
{
@@ -334,7 +338,7 @@ static int time_clock_to_frames( mlt_property self, co
@@ -353,7 +357,7 @@ static int time_clock_to_frames( mlt_property self, co
seconds = strtod( s, NULL );
}
@ -40,7 +40,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
@@ -510,7 +514,7 @@ static double mlt_property_atof( mlt_property self, do
@@ -529,7 +533,7 @@ static double mlt_property_atof( mlt_property self, do
if ( locale )
result = strtod_l( value, &end, locale );
else
@ -49,7 +49,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.
@@ -528,7 +532,7 @@ static double mlt_property_atof( mlt_property self, do
@@ -547,7 +551,7 @@ static double mlt_property_atof( mlt_property self, do
if ( end && end[0] == '%' )
result /= 100.0;
@ -58,7 +58,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
@@ -756,7 +760,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
@@ -775,7 +779,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
}
else if ( ! ( self->types & mlt_prop_string ) )
{
@ -67,7 +67,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__)
@@ -802,7 +806,7 @@ char *mlt_property_get_string_l_tf( mlt_property self,
@@ -821,7 +825,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 );
}
@ -76,7 +76,7 @@ Index: src/framework/mlt_property.c
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
free( orig_localename );
@@ -1000,7 +1004,7 @@ static void time_clock_from_frames( int frames, double
@@ -1033,7 +1037,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 )
{
@ -85,7 +85,7 @@ Index: src/framework/mlt_property.c
char *orig_localename = NULL;
#endif
int frames = 0;
@@ -1013,7 +1017,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
@@ -1046,7 +1050,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
if ( format == mlt_time_frames )
return mlt_property_get_string_l( self, locale );
@ -94,7 +94,7 @@ Index: src/framework/mlt_property.c
// Use the specified locale
if ( locale )
{
@@ -1072,7 +1076,7 @@ char *mlt_property_get_time( mlt_property self, mlt_ti
@@ -1105,7 +1109,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 );
@ -103,7 +103,7 @@ Index: src/framework/mlt_property.c
// Restore the current locale
if ( locale )
{
@@ -1116,7 +1120,7 @@ static int is_property_numeric( mlt_property self, loc
@@ -1149,7 +1153,7 @@ static int is_property_numeric( mlt_property self, loc
if ( locale )
strtod_l( self->prop_string, &p, locale );
else
@ -112,7 +112,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.
@@ -1132,7 +1136,7 @@ static int is_property_numeric( mlt_property self, loc
@@ -1165,7 +1169,7 @@ static int is_property_numeric( mlt_property self, loc
strtod( self->prop_string, &p );
@ -121,7 +121,7 @@ Index: src/framework/mlt_property.c
if ( locale ) {
// Restore the current locale
setlocale( LC_NUMERIC, orig_localename );
@@ -1617,7 +1621,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
@@ -1650,7 +1654,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
char *p = NULL;
int count = 0;
@ -130,7 +130,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.
@@ -1669,7 +1673,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
@@ -1702,7 +1706,7 @@ mlt_rect mlt_property_get_rect( mlt_property self, loc
count ++;
}

6
multimedia/mlt/patches/patch-src_mlt++_Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_mlt++_Makefile,v 1.4 2019/04/26 13:39:16 rsadowski Exp $
$OpenBSD: patch-src_mlt++_Makefile,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
Index: src/mlt++/Makefile
--- src/mlt++/Makefile.orig
+++ src/mlt++/Makefile
@ -13,7 +13,7 @@ Index: src/mlt++/Makefile
else
TARGET = $(NAME).$(version)
SONAME = $(NAME).$(soversion)
@@ -57,10 +61,12 @@ all: $(TARGET)
@@ -58,10 +62,12 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@ -29,7 +29,7 @@ Index: src/mlt++/Makefile
depend: $(SRCS)
$(CXX) -MM $(CXXFLAGS) $^ 1>.depend
@@ -81,6 +87,8 @@ install:
@@ -82,6 +88,8 @@ install:
$(INSTALL) -m 755 $(TARGET) "$(DESTDIR)$(bindir)/libmlt++.dll" ; \
fi; \
$(INSTALL) -m 644 libmlt++.def "$(DESTDIR)$(libdir)" ; \

4
multimedia/mlt/patches/patch-src_modules_avformat_producer_avformat_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_modules_avformat_producer_avformat_c,v 1.1 2020/05/18 10:33:17 espie Exp $
$OpenBSD: patch-src_modules_avformat_producer_avformat_c,v 1.2 2020/08/24 14:09:54 rsadowski Exp $
Index: src/modules/avformat/producer_avformat.c
--- src/modules/avformat/producer_avformat.c.orig
+++ src/modules/avformat/producer_avformat.c
@@ -755,10 +755,13 @@ static int producer_open(producer_avformat self, mlt_p
@@ -778,10 +778,13 @@ static int producer_open(producer_avformat self, mlt_p
if ( !self->is_mutex_init )
{

6
multimedia/mlt/pkg/PLIST-gpl2
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-gpl2,v 1.4 2020/05/18 10:33:17 espie Exp $
@so lib/mlt/libmltlinsys.so
@comment $OpenBSD: PLIST-gpl2,v 1.5 2020/08/24 14:09:54 rsadowski Exp $
@so lib/mlt/libmltmotion_est.so
@so lib/mlt/libmltnormalize.so
@so lib/mlt/libmltplusgpl.so
@ -8,8 +7,6 @@
@so lib/mlt/libmltsdl2.so
@so lib/mlt/libmltvideostab.so
@so lib/mlt/libmltxine.so
share/mlt/linsys/
share/mlt/linsys/consumer_sdi.yml
share/mlt/motion_est/
share/mlt/motion_est/filter_autotrack_rectangle.yml
share/mlt/motion_est/filter_motion_est.yml
@ -23,7 +20,6 @@ share/mlt/plusgpl/consumer_cbrts.yml
share/mlt/plusgpl/filter_burningtv.yml
share/mlt/plusgpl/filter_lumaliftgaingamma.yml
share/mlt/plusgpl/filter_rotoscoping.yml
share/mlt/qt/
share/mlt/qt/filter_audiospectrum.yml
share/mlt/qt/filter_audiowaveform.yml
share/mlt/qt/filter_lightshow.yml

18
multimedia/mlt/pkg/PLIST-main
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST-main,v 1.10 2020/05/18 10:33:17 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.11 2020/08/24 14:09:54 rsadowski Exp $
@conflict freeze-<2.5p2
@bin bin/melt
include/mlt/
include/mlt++/
include/mlt++/Mlt.h
include/mlt++/MltAnimation.h
include/mlt++/MltAudio.h
include/mlt++/MltConfig.h
include/mlt++/MltConsumer.h
include/mlt++/MltDeque.h
@ -31,6 +32,7 @@ include/mlt++/MltTransition.h
include/mlt/framework/
include/mlt/framework/mlt.h
include/mlt/framework/mlt_animation.h
include/mlt/framework/mlt_audio.h
include/mlt/framework/mlt_cache.h
include/mlt/framework/mlt_consumer.h
include/mlt/framework/mlt_deque.h
@ -65,7 +67,7 @@ lib/mlt/
@so lib/mlt/libmltcore.so
@so lib/mlt/libmltdecklink.so
@so lib/mlt/libmltfrei0r.so
@so lib/mlt/libmltgtk2.so
@so lib/mlt/libmltgdk.so
@so lib/mlt/libmltjackrack.so
@so lib/mlt/libmltkdenlive.so
@so lib/mlt/libmltoldfilm.so
@ -83,6 +85,7 @@ share/mlt/avformat/
share/mlt/avformat/blacklist.txt
share/mlt/avformat/consumer_avformat.yml
share/mlt/avformat/producer_avformat.yml
share/mlt/avformat/yuv_only.txt
share/mlt/core/
share/mlt/core/consumer_multi.yml
share/mlt/core/data_fx.properties
@ -143,11 +146,10 @@ share/mlt/frei0r/filter_cairoblend_mode.yml
share/mlt/frei0r/not_thread_safe.txt
share/mlt/frei0r/param_name_map.yaml
share/mlt/frei0r/resolution_scale.yml
share/mlt/gtk2/
share/mlt/gtk2/consumer_gtk2_preview.yml
share/mlt/gtk2/filter_rescale.yml
share/mlt/gtk2/producer_pango.yml
share/mlt/gtk2/producer_pixbuf.yml
share/mlt/gdk/
share/mlt/gdk/filter_rescale.yml
share/mlt/gdk/producer_pango.yml
share/mlt/gdk/producer_pixbuf.yml
share/mlt/jackrack/
share/mlt/jackrack/blacklist.txt
share/mlt/jackrack/consumer_jack.yml
@ -213,6 +215,8 @@ share/mlt/presets/consumer/avformat/MP3
share/mlt/presets/consumer/avformat/MPEG-2
share/mlt/presets/consumer/avformat/MPEG-4
share/mlt/presets/consumer/avformat/MPEG-4-ASP
share/mlt/presets/consumer/avformat/Slide-Deck-H264
share/mlt/presets/consumer/avformat/Slide-Deck-HEVC
share/mlt/presets/consumer/avformat/Sony-PSP
share/mlt/presets/consumer/avformat/Vorbis
share/mlt/presets/consumer/avformat/WAV