Update mlt to 6.14.0. This update will not fix our issues with
x11/kde-applications/kdenlive but it doesn't make it any worse!
OK?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 10 Mar 2019 12:17:07 -0000 1.20
+++ Makefile 16 Apr 2019 19:28:21 -0000
@@ -2,12 +2,10 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.12.0
+VERSION = 6.14.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
-REVISION-gpl2 = 1
-REVISION-main = 1
# XXX versions should be kept in sync together
SHARED_LIBS = mlt 3.0
@@ -23,13 +21,16 @@ MAINTAINER = Rafael Sadowski <rsadowski
# file gets included, see --enable-gpl3 configure option.
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB-main += ${COMPILER_LIBCXX} SDL SDL2 X11 SDL_image avcodec avdevice
-WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig gdk-x11-2.0
-WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
-WANTLIB-main += pangoft2-1.0 sox swresample swscale xml2
+WANTLIB-main += ${COMPILER_LIBCXX} SDL SDL2 SDL_image X11 Xcomposite
+WANTLIB-main += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB-main += atk-1.0 avcodec avdevice avfilter avformat avutil c
+WANTLIB-main += cairo exif fftw3 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 intl jack
+WANTLIB-main += m pango-1.0 pangocairo-1.0 pangoft2-1.0 sox swresample
+WANTLIB-main += swscale xml2 z
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml SDL2 exif m mlt mlt++ samplerate
+WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
MASTER_SITES =
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
@@ -72,7 +73,6 @@ CONFIGURE_ARGS = --mandir=${PREFIX}/man
--disable-kino \
--disable-swfdec \
--enable-gpl
-
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${PREFIX}/man/man1/
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 2 Jan 2019 14:14:05 -0000 1.5
+++ distinfo 16 Apr 2019 19:28:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.12.0.tar.gz) = BTBFBOHcIf6ebDQZC3D6OOa9zoU0BBZu5+BQS2eN3A8=
-SIZE (mlt-6.12.0.tar.gz) = 1395646
+SHA256 (mlt-6.14.0.tar.gz) = n88l6t/yiu6imnHGfPc7NXOpE0QkxW3idTTyJHwqfGs=
+SIZE (mlt-6.14.0.tar.gz) = 1413015
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 28 May 2015 12:01:15 -0000 1.2
+++ patches/patch-configure 16 Apr 2019 19:28:21 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.2 2015/05/28 12:01:15 jca Exp $
---- configure.orig Sun Jun 29 22:23:17 2014
-+++ configure Tue May 26 19:19:08 2015
-@@ -122,6 +122,13 @@ build_config()
+Index: configure
+--- configure.orig
++++ configure
+@@ -124,6 +124,13 @@ build_config()
echo "RDYNAMIC=-rdynamic"
echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
;;
@@ -13,5 +14,5 @@ $OpenBSD: patch-configure,v 1.2 2015/05/
+ echo "LDFLAGS+=-Wl,--as-needed"
+ ;;
MinGW)
- [ "$optimisations" = "true" ] &&
- echo "OPTIMISATIONS+=-ffast-math"
+ [ "$windeploy" = false ] &&
+ echo "CFLAGS+=-DNODEPLOY"
Index: patches/patch-src_framework_Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_framework_Makefile
--- patches/patch-src_framework_Makefile 29 Jul 2018 15:05:35 -0000
1.2
+++ patches/patch-src_framework_Makefile 16 Apr 2019 19:28:21 -0000
@@ -36,10 +36,10 @@ Index: src/framework/Makefile
depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -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) ; \
+@@ -121,6 +125,8 @@ install:
+ install -m 755 $(TARGET)
"$(DESTDIR)$(bindir)/libmlt.dll" ; \
+ fi; \
+ install -m 644 libmlt.def "$(DESTDIR)$(libdir)" ; \
+ elif [ "$(targetos)" = "OpenBSD" ]; then \
+ install -m 444 $(TARGET) $(DESTDIR)$(libdir) ; \
else \
Index: patches/patch-src_framework_mlt_property_h
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_framework_mlt_property_h
--- patches/patch-src_framework_mlt_property_h 29 Jul 2018 15:05:35 -0000
1.2
+++ patches/patch-src_framework_mlt_property_h 16 Apr 2019 19:28:21 -0000
@@ -3,12 +3,9 @@ $OpenBSD: patch-src_framework_mlt_proper
Index: src/framework/mlt_property.h
--- src/framework/mlt_property.h.orig
+++ src/framework/mlt_property.h
-@@ -32,8 +32,11 @@
-
- #if (defined(__GLIBC__) && !defined(__APPLE__)) || HAVE_LOCALE_H
+@@ -34,6 +34,9 @@
# include <locale.h>
--#elif defined(__APPLE__) || (__FreeBSD_version >= 900506)
-+#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__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++ */
Index: patches/patch-src_mlt++_Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_mlt++_Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_mlt++_Makefile
--- patches/patch-src_mlt++_Makefile 3 Apr 2016 19:15:23 -0000 1.3
+++ patches/patch-src_mlt++_Makefile 16 Apr 2019 19:28:21 -0000
@@ -1,17 +1,18 @@
$OpenBSD: patch-src_mlt++_Makefile,v 1.3 2016/04/03 19:15:23 zhuk Exp $
---- src/mlt++/Makefile.orig Thu Feb 18 00:43:24 2016
-+++ src/mlt++/Makefile Mon Feb 29 19:34:22 2016
-@@ -12,6 +12,10 @@ NAME = libmlt++$(LIBSUF)
- TARGET = libmlt++-$(soversion)$(LIBSUF)
- CXXFLAGS += -DMLTPP_EXPORTS
- LIBFLAGS += -Wl,--output-def,libmlt++.def
+Index: src/mlt++/Makefile
+--- src/mlt++/Makefile.orig
++++ src/mlt++/Makefile
+@@ -11,6 +11,10 @@ else ifeq ($(targetos), MinGW)
+ TARGET = libmlt++-$(soversion)$(LIBSUF)
+ CXXFLAGS += -DMLTPP_EXPORTS
+ LIBFLAGS += -Wl,--output-def,libmlt++.def
+else ifeq ($(targetos), OpenBSD)
-+LIBmlt++_VERSION ?= $(soversion)
-+TARGET = libmlt++$(LIBSUF).$(LIBmlt++_VERSION)
-+LIBFLAGS += -shared
++ LIBmlt++_VERSION ?= $(soversion)
++ TARGET = libmlt++$(LIBSUF).$(LIBmlt++_VERSION)
++ LIBFLAGS += -shared
else
- NAME = libmlt++$(LIBSUF)
- TARGET = $(NAME).$(version)
+ TARGET = $(NAME).$(version)
+ SONAME = $(NAME).$(soversion)
@@ -57,10 +61,12 @@ all: $(TARGET)
$(TARGET): $(OBJS)
@@ -28,10 +29,10 @@ $OpenBSD: patch-src_mlt++_Makefile,v 1.3
depend: $(SRCS)
$(CXX) -MM $(CXXFLAGS) $^ 1>.depend
-@@ -76,6 +82,8 @@ install:
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt++.dll ; \
- $(INSTALL) -m 644 libmlt++.def $(DESTDIR)$(libdir) ; \
+@@ -81,6 +87,8 @@ install:
+ $(INSTALL) -m 755 $(TARGET)
"$(DESTDIR)$(bindir)/libmlt++.dll" ; \
+ fi; \
+ $(INSTALL) -m 644 libmlt++.def "$(DESTDIR)$(libdir)" ; \
+ elif [ "$(targetos)" = "OpenBSD" ]; then \
+ $(INSTALL) -m 444 $(TARGET) $(DESTDIR)$(libdir) ; \
else \
Index: patches/patch-src_modules_plusgpl_consumer_cbrts_c
===================================================================
RCS file:
/cvs/ports/multimedia/mlt/patches/patch-src_modules_plusgpl_consumer_cbrts_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_plusgpl_consumer_cbrts_c
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c 29 Jul 2018 15:05:35
-0000 1.3
+++ patches/patch-src_modules_plusgpl_consumer_cbrts_c 16 Apr 2019 19:28:21
-0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_modules_plusgpl_cons
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
+@@ -255,6 +255,10 @@ static void load_sections( consumer_cbrts self, mlt_pr
{
size_t len = strlen( name );
char *si_name = strdup( name + 3 );
Index: patches/patch-src_modules_qt_Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_modules_qt_Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_qt_Makefile
--- patches/patch-src_modules_qt_Makefile 29 Jul 2018 15:05:35 -0000
1.3
+++ patches/patch-src_modules_qt_Makefile 16 Apr 2019 19:28:21 -0000
@@ -3,7 +3,7 @@ XXX Dirty hack
Index: src/modules/qt/Makefile
--- src/modules/qt/Makefile.orig
+++ src/modules/qt/Makefile
-@@ -33,6 +33,10 @@ ifdef USE_FFTW
+@@ -34,6 +34,10 @@ ifdef USE_FFTW
CFLAGS += -DUSE_FFTW
endif
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 2 Jan 2019 14:14:05 -0000 1.8
+++ pkg/PLIST-main 16 Apr 2019 19:28:21 -0000
@@ -94,6 +94,8 @@ share/mlt/core/filter_fieldorder.yml
share/mlt/core/filter_gamma.yml
share/mlt/core/filter_greyscale.yml
share/mlt/core/filter_luma.yml
+share/mlt/core/filter_mask_apply.yml
+share/mlt/core/filter_mask_start.yml
share/mlt/core/filter_mirror.yml
share/mlt/core/filter_mono.yml
share/mlt/core/filter_obscure.yml
@@ -155,6 +157,52 @@ share/mlt/kdenlive/filter_freeze.yml
share/mlt/kdenlive/filter_wave.yml
share/mlt/kdenlive/producer_framebuffer.yml
share/mlt/lumas/
+share/mlt/lumas/16_9/
+share/mlt/lumas/16_9/luma01.pgm
+share/mlt/lumas/16_9/luma02.pgm
+share/mlt/lumas/16_9/luma03.pgm
+share/mlt/lumas/16_9/luma04.pgm
+share/mlt/lumas/16_9/luma05.pgm
+share/mlt/lumas/16_9/luma06.pgm
+share/mlt/lumas/16_9/luma07.pgm
+share/mlt/lumas/16_9/luma08.pgm
+share/mlt/lumas/16_9/luma09.pgm
+share/mlt/lumas/16_9/luma10.pgm
+share/mlt/lumas/16_9/luma11.pgm
+share/mlt/lumas/16_9/luma12.pgm
+share/mlt/lumas/16_9/luma13.pgm
+share/mlt/lumas/16_9/luma14.pgm
+share/mlt/lumas/16_9/luma15.pgm
+share/mlt/lumas/16_9/luma16.pgm
+share/mlt/lumas/16_9/luma17.pgm
+share/mlt/lumas/16_9/luma18.pgm
+share/mlt/lumas/16_9/luma19.pgm
+share/mlt/lumas/16_9/luma20.pgm
+share/mlt/lumas/16_9/luma21.pgm
+share/mlt/lumas/16_9/luma22.pgm
+share/mlt/lumas/9_16/
+share/mlt/lumas/9_16/luma01.pgm
+share/mlt/lumas/9_16/luma02.pgm
+share/mlt/lumas/9_16/luma03.pgm
+share/mlt/lumas/9_16/luma04.pgm
+share/mlt/lumas/9_16/luma05.pgm
+share/mlt/lumas/9_16/luma06.pgm
+share/mlt/lumas/9_16/luma07.pgm
+share/mlt/lumas/9_16/luma08.pgm
+share/mlt/lumas/9_16/luma09.pgm
+share/mlt/lumas/9_16/luma10.pgm
+share/mlt/lumas/9_16/luma11.pgm
+share/mlt/lumas/9_16/luma12.pgm
+share/mlt/lumas/9_16/luma13.pgm
+share/mlt/lumas/9_16/luma14.pgm
+share/mlt/lumas/9_16/luma15.pgm
+share/mlt/lumas/9_16/luma16.pgm
+share/mlt/lumas/9_16/luma17.pgm
+share/mlt/lumas/9_16/luma18.pgm
+share/mlt/lumas/9_16/luma19.pgm
+share/mlt/lumas/9_16/luma20.pgm
+share/mlt/lumas/9_16/luma21.pgm
+share/mlt/lumas/9_16/luma22.pgm
share/mlt/lumas/NTSC/
share/mlt/lumas/NTSC/luma01.pgm
share/mlt/lumas/NTSC/luma02.pgm
@@ -201,6 +249,29 @@ share/mlt/lumas/PAL/luma19.pgm
share/mlt/lumas/PAL/luma20.pgm
share/mlt/lumas/PAL/luma21.pgm
share/mlt/lumas/PAL/luma22.pgm
+share/mlt/lumas/square/
+share/mlt/lumas/square/luma01.pgm
+share/mlt/lumas/square/luma02.pgm
+share/mlt/lumas/square/luma03.pgm
+share/mlt/lumas/square/luma04.pgm
+share/mlt/lumas/square/luma05.pgm
+share/mlt/lumas/square/luma06.pgm
+share/mlt/lumas/square/luma07.pgm
+share/mlt/lumas/square/luma08.pgm
+share/mlt/lumas/square/luma09.pgm
+share/mlt/lumas/square/luma10.pgm
+share/mlt/lumas/square/luma11.pgm
+share/mlt/lumas/square/luma12.pgm
+share/mlt/lumas/square/luma13.pgm
+share/mlt/lumas/square/luma14.pgm
+share/mlt/lumas/square/luma15.pgm
+share/mlt/lumas/square/luma16.pgm
+share/mlt/lumas/square/luma17.pgm
+share/mlt/lumas/square/luma18.pgm
+share/mlt/lumas/square/luma19.pgm
+share/mlt/lumas/square/luma20.pgm
+share/mlt/lumas/square/luma21.pgm
+share/mlt/lumas/square/luma22.pgm
share/mlt/metaschema.yaml
share/mlt/oldfilm/
share/mlt/oldfilm/dust1.svg
@@ -446,6 +517,9 @@ share/mlt/profiles/uhd_2160p_5994
share/mlt/profiles/uhd_2160p_60
share/mlt/profiles/vcd_ntsc
share/mlt/profiles/vcd_pal
+share/mlt/profiles/vertical_hd_30
+share/mlt/profiles/vertical_hd_60
+share/mlt/qt/filter_qtext.yml
share/mlt/sdl/
share/mlt/sdl/consumer_sdl.yml
share/mlt/sdl/consumer_sdl_audio.yml
