Update multimedia/mlt to the latest release. Also fixes the build with
clang. I don't use melt, but the tests only have one failure (mentioned
in the Makefile) and it could play a few sample videos. A minor lib bump
is required, but I'm not confident it's sufficient, so the patch cranks
the major.
- Matthew Martin
diff --git Makefile Makefile
index f85a35f6c36..65519303346 100644
--- Makefile
+++ Makefile
@@ -2,19 +2,17 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.0.0
+VERSION = 6.6.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION-main = 3
-REVISION-gpl2 = 1
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 1.1
-SHARED_LIBS += mlt++ 1.1
+SHARED_LIBS = mlt 2.0
+SHARED_LIBS += mlt++ 2.0
CATEGORIES = multimedia devel
-HOMEPAGE = http://www.mltframework.org/
+HOMEPAGE = https://www.mltframework.org/
MAINTAINER = KDE porting team <openbsd-...@googlegroups.com>
@@ -32,7 +30,7 @@ WANTLIB-gpl2 = ${COMPILER_LIBCXX} ${MODQT4_WANTLIB}
lib/qt4/QtGui
WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL
WANTLIB-gpl2 += X11 exif m mlt mlt++ pthread samplerate
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/}
+MASTER_SITES =
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
EXTRACT_SUFX = .tar.gz
MULTI_PACKAGES = -main -gpl2
diff --git distinfo distinfo
index 97ca536deaf..b9f40dcf92d 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
-SIZE (mlt-6.0.0.tar.gz) = 1281478
+SHA256 (mlt-6.6.0.tar.gz) = KMvFl09y7yKNYkpYgJx8gFU3L19i9YgtwFUJnURLLN0=
+SIZE (mlt-6.6.0.tar.gz) = 1365768
diff --git patches/patch-src_framework_Makefile
patches/patch-src_framework_Makefile
index df2402ea8a3..196abbcb6ec 100644
--- patches/patch-src_framework_Makefile
+++ patches/patch-src_framework_Makefile
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $
---- src/framework/Makefile.orig Sun Jun 29 22:23:17 2014
-+++ src/framework/Makefile Wed Jul 9 09:43:49 2014
+Index: src/framework/Makefile
+--- src/framework/Makefile.orig
++++ src/framework/Makefile
@@ -1,7 +1,6 @@
include ../../config.mak
include config.mak
@@ -19,7 +20,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14
09:15:12 zhuk Exp $
else
NAME = libmlt$(LIBSUF)
TARGET = $(NAME).$(version)
-@@ -94,10 +96,12 @@ all: $(TARGET)
+@@ -96,10 +98,12 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@@ -35,7 +36,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14
09:15:12 zhuk Exp $
depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -114,6 +118,8 @@ install:
+@@ -116,6 +120,8 @@ install:
install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
diff --git patches/patch-src_framework_mlt_property_h
patches/patch-src_framework_mlt_property_h
index 02e8d4d10fe..d93fa11d176 100644
--- patches/patch-src_framework_mlt_property_h
+++ patches/patch-src_framework_mlt_property_h
@@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_property_h,v 1.1 2017/05/24
16:30:52 espie Exp
Index: src/framework/mlt_property.h
--- src/framework/mlt_property.h.orig
+++ src/framework/mlt_property.h
-@@ -30,8 +30,11 @@
- #include <sys/param.h>
- #endif
+@@ -32,8 +32,11 @@
--#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD_version) &&
(__FreeBSD_version >= 900506)
- #include <xlocale.h>
+ #if defined(__GLIBC__) && !defined(__APPLE__)
+ # include <locale.h>
+-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
++#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version
>= 900506)
+ # include <xlocale.h>
+#elif defined(__OpenBSD__)
+/* XXX matches __nop_locale glue in libc++ */
+typedef void* locale_t;
diff --git patches/patch-src_modules_plusgpl_consumer_cbrts_c
patches/patch-src_modules_plusgpl_consumer_cbrts_c
index a457a6ca42f..992c32eff07 100644
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c
+++ patches/patch-src_modules_plusgpl_consumer_cbrts_c
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_plusgpl_consumer_cbrts_c,v 1.2 2016/04/03 19:15:23
zhuk Exp $
---- src/modules/plusgpl/consumer_cbrts.c.orig Thu Feb 18 00:43:24 2016
-+++ src/modules/plusgpl/consumer_cbrts.c Mon Feb 29 19:34:22 2016
-@@ -251,6 +251,10 @@ static void load_sections( consumer_cbrts self, mlt_pr
+Index: src/modules/plusgpl/consumer_cbrts.c
+--- src/modules/plusgpl/consumer_cbrts.c.orig
++++ src/modules/plusgpl/consumer_cbrts.c
+@@ -254,6 +254,10 @@ static void load_sections( consumer_cbrts self, mlt_pr
{
size_t len = strlen( name );
char *si_name = strdup( name + 3 );
diff --git patches/patch-src_modules_qt_Makefile
patches/patch-src_modules_qt_Makefile
index eda7bac1363..b25ec900fca 100644
--- patches/patch-src_modules_qt_Makefile
+++ patches/patch-src_modules_qt_Makefile
@@ -1,8 +1,9 @@
$OpenBSD: patch-src_modules_qt_Makefile,v 1.2 2016/04/03 19:15:23 zhuk Exp $
XXX Dirty hack
---- src/modules/qt/Makefile.orig Thu Feb 18 00:43:24 2016
-+++ src/modules/qt/Makefile Mon Feb 29 19:37:04 2016
-@@ -31,6 +31,10 @@ ifdef USE_FFTW
+Index: src/modules/qt/Makefile
+--- src/modules/qt/Makefile.orig
++++ src/modules/qt/Makefile
+@@ -33,6 +33,10 @@ ifdef USE_FFTW
CFLAGS += -DUSE_FFTW
endif
diff --git pkg/PLIST-gpl2 pkg/PLIST-gpl2
index 4dff9f73443..dcb30bd1326 100644
--- pkg/PLIST-gpl2
+++ pkg/PLIST-gpl2
@@ -26,9 +26,11 @@ share/mlt/qt/
share/mlt/qt/filter_audiospectrum.yml
share/mlt/qt/filter_audiowaveform.yml
share/mlt/qt/filter_lightshow.yml
+share/mlt/qt/filter_qtblend.yml
share/mlt/qt/producer_kdenlivetitle.yml
share/mlt/qt/producer_qimage.yml
share/mlt/qt/producer_qtext.yml
+share/mlt/qt/transition_qtblend.yml
share/mlt/qt/transition_vqm.yml
share/mlt/resample/
share/mlt/resample/filter_resample.yml
diff --git pkg/PLIST-main pkg/PLIST-main
index de16ffc481f..5e0ad3fce00 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -5,6 +5,7 @@ include/mlt/
include/mlt++/
include/mlt++/Mlt.h
include/mlt++/MltAnimation.h
+include/mlt++/MltConfig.h
include/mlt++/MltConsumer.h
include/mlt++/MltDeque.h
include/mlt++/MltEvent.h
@@ -27,7 +28,6 @@ include/mlt++/MltService.h
include/mlt++/MltTokeniser.h
include/mlt++/MltTractor.h
include/mlt++/MltTransition.h
-include/mlt++/config.h
include/mlt/framework/
include/mlt/framework/mlt.h
include/mlt/framework/mlt_animation.h
@@ -51,6 +51,7 @@ include/mlt/framework/mlt_properties.h
include/mlt/framework/mlt_property.h
include/mlt/framework/mlt_repository.h
include/mlt/framework/mlt_service.h
+include/mlt/framework/mlt_slices.h
include/mlt/framework/mlt_tokeniser.h
include/mlt/framework/mlt_tractor.h
include/mlt/framework/mlt_transition.h
@@ -75,6 +76,7 @@ lib/pkgconfig/mlt++.pc
lib/pkgconfig/mlt-framework.pc
share/mlt/
share/mlt/avformat/
+share/mlt/avformat/blacklist.txt
share/mlt/avformat/consumer_avformat.yml
share/mlt/avformat/producer_avformat.yml
share/mlt/core/
@@ -137,6 +139,7 @@ share/mlt/gtk2/producer_pixbuf.yml
share/mlt/jackrack/
share/mlt/jackrack/blacklist.txt
share/mlt/jackrack/consumer_jack.yml
+share/mlt/jackrack/filter_jack.yml
share/mlt/jackrack/filter_jackrack.yml
share/mlt/jackrack/filter_ladspa.yml
share/mlt/jackrack/producer_ladspa.yml
@@ -216,11 +219,13 @@ share/mlt/plus/consumer_blipflash.yml
share/mlt/plus/filter_affine.yml
share/mlt/plus/filter_charcoal.yml
share/mlt/plus/filter_dance.yml
+share/mlt/plus/filter_dynamic_loudness.yml
share/mlt/plus/filter_dynamictext.yml
share/mlt/plus/filter_fft.yml
share/mlt/plus/filter_invert.yml
share/mlt/plus/filter_lift_gamma_gain.yml
share/mlt/plus/filter_loudness.yml
+share/mlt/plus/filter_loudness_meter.yml
share/mlt/plus/filter_lumakey.yml
share/mlt/plus/filter_rgblut.yml
share/mlt/plus/filter_sepia.yml
@@ -232,6 +237,7 @@ share/mlt/presets/consumer/
share/mlt/presets/consumer/avformat/
share/mlt/presets/consumer/avformat/AAC
share/mlt/presets/consumer/avformat/Flash
+share/mlt/presets/consumer/avformat/GIF
share/mlt/presets/consumer/avformat/MJPEG
share/mlt/presets/consumer/avformat/MP3
share/mlt/presets/consumer/avformat/MPEG-2
@@ -243,6 +249,7 @@ share/mlt/presets/consumer/avformat/WAV
share/mlt/presets/consumer/avformat/WMA
share/mlt/presets/consumer/avformat/WMV
share/mlt/presets/consumer/avformat/XDCAM-HD422
+share/mlt/presets/consumer/avformat/YouTube
share/mlt/presets/consumer/avformat/atsc_1080i_50/
share/mlt/presets/consumer/avformat/atsc_1080i_50/DNxHD
share/mlt/presets/consumer/avformat/atsc_1080i_5994/
@@ -307,15 +314,16 @@ share/mlt/presets/consumer/avformat/hdv_720_50p/
share/mlt/presets/consumer/avformat/hdv_720_50p/HDV
share/mlt/presets/consumer/avformat/hdv_720_60p/
share/mlt/presets/consumer/avformat/hdv_720_60p/HDV
+share/mlt/presets/consumer/avformat/intermediate/
+share/mlt/presets/consumer/avformat/intermediate/MJPEG
+share/mlt/presets/consumer/avformat/intermediate/MPEG-2
+share/mlt/presets/consumer/avformat/intermediate/MPEG-4
+share/mlt/presets/consumer/avformat/intermediate/ProRes
+share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya
share/mlt/presets/consumer/avformat/lossless/
share/mlt/presets/consumer/avformat/lossless/FFV1
share/mlt/presets/consumer/avformat/lossless/H.264
share/mlt/presets/consumer/avformat/lossless/HuffYUV
-share/mlt/presets/consumer/avformat/lossless/MJPEG
-share/mlt/presets/consumer/avformat/lossless/MPEG-2
-share/mlt/presets/consumer/avformat/lossless/MPEG-4
-share/mlt/presets/consumer/avformat/lossless/ProRes
-share/mlt/presets/consumer/avformat/lossless/ProRes-Kostya
share/mlt/presets/consumer/avformat/stills/
share/mlt/presets/consumer/avformat/stills/BMP
share/mlt/presets/consumer/avformat/stills/DPX
