Simple update to the latest stable version.
- Update mlt from 6.20 to 6.22
- Drop maintainer
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile 20 May 2020 09:17:03 -0000 1.26
+++ Makefile 23 Aug 2020 19:14:20 -0000
@@ -2,11 +2,10 @@
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
@@ -15,8 +14,6 @@ SHARED_LIBS += mlt++ 3.2
CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-
-MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
# GPLv2+, LGPLv2.1+
# Actually, qimage module could be under GPLv3+ if one more object
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo 18 May 2020 10:33:17 -0000 1.8
+++ distinfo 23 Aug 2020 19:14:20 -0000
@@ -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
Index: patches/patch-src_framework_Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_framework_Makefile
--- patches/patch-src_framework_Makefile 18 May 2020 10:33:17 -0000
1.4
+++ patches/patch-src_framework_Makefile 23 Aug 2020 19:14:20 -0000
@@ -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)" ; \
Index: patches/patch-src_framework_mlt_property_c
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_framework_mlt_property_c
--- patches/patch-src_framework_mlt_property_c 20 May 2020 09:17:04 -0000
1.3
+++ patches/patch-src_framework_mlt_property_c 23 Aug 2020 19:14:20 -0000
@@ -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 ++;
}
Index: patches/patch-src_mlt++_Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_mlt++_Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_mlt++_Makefile
--- patches/patch-src_mlt++_Makefile 26 Apr 2019 13:39:16 -0000 1.4
+++ patches/patch-src_mlt++_Makefile 23 Aug 2020 19:14:20 -0000
@@ -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)" ; \
Index: patches/patch-src_modules_avformat_producer_avformat_c
===================================================================
RCS file:
/cvs/ports/multimedia/mlt/patches/patch-src_modules_avformat_producer_avformat_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_avformat_producer_avformat_c
--- patches/patch-src_modules_avformat_producer_avformat_c 18 May 2020
10:33:17 -0000 1.1
+++ patches/patch-src_modules_avformat_producer_avformat_c 23 Aug 2020
19:14:20 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_avformat_pro
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 )
{
Index: pkg/PLIST-gpl2
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-gpl2,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-gpl2
--- pkg/PLIST-gpl2 18 May 2020 10:33:17 -0000 1.4
+++ pkg/PLIST-gpl2 23 Aug 2020 19:14:20 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-gpl2,v 1.4 2020/05/18 10:33:17 espie Exp $
-@so lib/mlt/libmltlinsys.so
@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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 18 May 2020 10:33:17 -0000 1.10
+++ pkg/PLIST-main 23 Aug 2020 19:14:20 -0000
@@ -5,6 +5,7 @@ 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.
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
