On Fri, May 15, 2020 at 09:55:27AM -0600, Tracey Emery wrote:
> This updates mlt to 6.20.0
>
> - Removed 5 patches
> - Minor bump for new symbols
> - Changelog: https://github.com/mltframework/mlt/releases
>
> Testers? Ok?
>
> --
>
> Tracey Emery
>
Now with 100% more cvs remove.
--
Tracey Emery
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- Makefile 12 Jul 2019 20:47:57 -0000 1.23
+++ Makefile 15 May 2020 18:27:58 -0000
@@ -2,14 +2,14 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.16.0
+VERSION = 6.20.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 3.1
-SHARED_LIBS += mlt++ 3.1
+SHARED_LIBS = mlt 3.2
+SHARED_LIBS += mlt++ 3.2
CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
@@ -21,13 +21,10 @@ MAINTAINER = Rafael Sadowski <rsadowski
# file gets included, see --enable-gpl3 configure option.
PERMIT_PACKAGE = Yes
-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-main += ${COMPILER_LIBCXX} SDL SDL2 SDL_image X11 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 vorbisfile xml2
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 10 May 2019 15:57:37 -0000 1.7
+++ distinfo 15 May 2020 18:27:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.16.0.tar.gz) = 2fzC1D8PdoBfU63KcOl5W/6nlSgF130UvjoqNj+x7cM=
-SIZE (mlt-6.16.0.tar.gz) = 1414374
+SHA256 (mlt-6.20.0.tar.gz) = qyEeJ8BsBoj5y+LXTcBiNiTvdepPlO6pFc3DExlr4t0=
+SIZE (mlt-6.20.0.tar.gz) = 1446137
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 26 Apr 2019 13:39:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2019/04/26 13:39:16 rsadowski Exp $
-Index: configure
---- configure.orig
-+++ configure
-@@ -124,6 +124,13 @@ build_config()
- echo "RDYNAMIC=-rdynamic"
- echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
- ;;
-+ OpenBSD)
-+ echo "CFLAGS+=-fPIC"
-+ echo "CXXFLAGS+=-fPIC"
-+ echo "SHFLAGS=-shared"
-+ echo "RDYNAMIC=-rdynamic"
-+ echo "LDFLAGS+=-Wl,--as-needed"
-+ ;;
- MinGW)
- [ "$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.3
diff -u -p -u -r1.3 patch-src_framework_Makefile
--- patches/patch-src_framework_Makefile 26 Apr 2019 13:39:16 -0000
1.3
+++ patches/patch-src_framework_Makefile 15 May 2020 18:27:58 -0000
@@ -20,7 +20,7 @@ Index: src/framework/Makefile
else
NAME = libmlt$(LIBSUF)
TARGET = $(NAME).$(version)
-@@ -96,10 +98,12 @@ all: $(TARGET)
+@@ -98,10 +100,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
-@@ -121,6 +125,8 @@ install:
+@@ -123,6 +127,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_h
===================================================================
RCS file: patches/patch-src_framework_mlt_property_h
diff -N patches/patch-src_framework_mlt_property_h
--- patches/patch-src_framework_mlt_property_h 26 Apr 2019 13:39:16 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_framework_mlt_property_h,v 1.3 2019/04/26 13:39:16
rsadowski Exp $
-
-Index: src/framework/mlt_property.h
---- src/framework/mlt_property.h.orig
-+++ src/framework/mlt_property.h
-@@ -34,6 +34,9 @@
- # include <locale.h>
- #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;
- #else
- typedef char* locale_t;
- #endif
Index: patches/patch-src_modules_kino_endian_types_h
===================================================================
RCS file: patches/patch-src_modules_kino_endian_types_h
diff -N patches/patch-src_modules_kino_endian_types_h
--- patches/patch-src_modules_kino_endian_types_h 14 Jul 2014 09:15:12
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_modules_kino_endian_types_h,v 1.1.1.1 2014/07/14 09:15:12
zhuk Exp $
---- src/modules/kino/endian_types.h.orig Wed Jan 23 23:51:43 2013
-+++ src/modules/kino/endian_types.h Thu Jan 24 00:24:49 2013
-@@ -27,8 +27,10 @@
- #ifndef _ENDIAN_TYPES_H
- #define _ENDIAN_TYPES_H
-
-+#include <sys/types.h>
-+
- /* Needed for BYTE_ORDER and BIG/LITTLE_ENDIAN macros. */
--#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _BSD_SOURCE
- # define _BSD_SOURCE
- # include <endian.h>
-@@ -40,9 +42,12 @@
- # include <sys/endian.h>
- #endif /* !defined(__FreeBSD__) && !defined(__NetBSD__) */
-
--#include <sys/types.h>
--#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <byteswap.h>
-+#elif defined(__OpenBSD__)
-+#define bswap_16(x) swap16(x)
-+#define bswap_32(x) swap32(x)
-+#define bswap_64(x) swap64(x)
- #else
- #define bswap_16(x) bswap16(x)
- #define bswap_32(x) bswap32(x)
Index: patches/patch-src_modules_plusgpl_consumer_cbrts_c
===================================================================
RCS file: patches/patch-src_modules_plusgpl_consumer_cbrts_c
diff -N patches/patch-src_modules_plusgpl_consumer_cbrts_c
--- patches/patch-src_modules_plusgpl_consumer_cbrts_c 26 Apr 2019 13:39:16
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_modules_plusgpl_consumer_cbrts_c,v 1.4 2019/04/26 13:39:16
rsadowski Exp $
-Index: src/modules/plusgpl/consumer_cbrts.c
---- src/modules/plusgpl/consumer_cbrts.c.orig
-+++ src/modules/plusgpl/consumer_cbrts.c
-@@ -255,6 +255,10 @@ static void load_sections( consumer_cbrts self, mlt_pr
- {
- size_t len = strlen( name );
- char *si_name = strdup( name + 3 );
-+// unbreak compilation on OpenBSD
-+#ifdef si_pid
-+# undef si_pid
-+#endif
- char si_pid[len + 1];
-
- si_name[len - 3 - 5] = 0;
Index: patches/patch-src_modules_videostab_stab_estimate_c
===================================================================
RCS file: patches/patch-src_modules_videostab_stab_estimate_c
diff -N patches/patch-src_modules_videostab_stab_estimate_c
--- patches/patch-src_modules_videostab_stab_estimate_c 3 Apr 2016 19:15:23
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_modules_videostab_stab_estimate_c,v 1.2 2016/04/03
19:15:23 zhuk Exp $
---- src/modules/videostab/stab/estimate.c.orig Thu Feb 18 00:43:24 2016
-+++ src/modules/videostab/stab/estimate.c Mon Feb 29 20:03:36 2016
-@@ -18,7 +18,7 @@
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
--#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) &&
!defined(__NetBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(_WIN32) &&
!defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <values.h>
- #endif
-
Index: pkg/PLIST-gpl2
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-gpl2,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST-gpl2
--- pkg/PLIST-gpl2 29 Jul 2018 15:05:35 -0000 1.3
+++ pkg/PLIST-gpl2 15 May 2020 18:27:58 -0000
@@ -1,13 +1,13 @@
@comment $OpenBSD: PLIST-gpl2,v 1.3 2018/07/29 15:05:35 rsadowski Exp $
-lib/mlt/libmltlinsys.so
-lib/mlt/libmltmotion_est.so
-lib/mlt/libmltnormalize.so
-lib/mlt/libmltplusgpl.so
-lib/mlt/libmltqt.so
-lib/mlt/libmltresample.so
-lib/mlt/libmltsdl2.so
-lib/mlt/libmltvideostab.so
-lib/mlt/libmltxine.so
+@so lib/mlt/libmltlinsys.so
+@so lib/mlt/libmltmotion_est.so
+@so lib/mlt/libmltnormalize.so
+@so lib/mlt/libmltplusgpl.so
+@so lib/mlt/libmltqt.so
+@so lib/mlt/libmltresample.so
+@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/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -u -r1.9 PLIST-main
--- pkg/PLIST-main 26 Apr 2019 13:39:16 -0000 1.9
+++ pkg/PLIST-main 15 May 2020 18:27:58 -0000
@@ -41,6 +41,7 @@ include/mlt/framework/mlt_filter.h
include/mlt/framework/mlt_frame.h
include/mlt/framework/mlt_geometry.h
include/mlt/framework/mlt_log.h
+include/mlt/framework/mlt_luma_map.h
include/mlt/framework/mlt_multitrack.h
include/mlt/framework/mlt_parser.h
include/mlt/framework/mlt_playlist.h
@@ -60,19 +61,20 @@ include/mlt/framework/mlt_version.h
@lib lib/libmlt++.so.${LIBmlt++_VERSION}
@lib lib/libmlt.so.${LIBmlt_VERSION}
lib/mlt/
-lib/mlt/libmltavformat.so
-lib/mlt/libmltcore.so
-lib/mlt/libmltdecklink.so
-lib/mlt/libmltfrei0r.so
-lib/mlt/libmltgtk2.so
-lib/mlt/libmltjackrack.so
-lib/mlt/libmltkdenlive.so
-lib/mlt/libmltoldfilm.so
-lib/mlt/libmltplus.so
-lib/mlt/libmltsdl.so
-lib/mlt/libmltsox.so
-lib/mlt/libmltvmfx.so
-lib/mlt/libmltxml.so
+@so lib/mlt/libmltavformat.so
+@so lib/mlt/libmltcore.so
+@so lib/mlt/libmltdecklink.so
+@so lib/mlt/libmltfrei0r.so
+@so lib/mlt/libmltgtk2.so
+@so lib/mlt/libmltjackrack.so
+@so lib/mlt/libmltkdenlive.so
+@so lib/mlt/libmltoldfilm.so
+@so lib/mlt/libmltplus.so
+@so lib/mlt/libmltsdl.so
+@so lib/mlt/libmltsox.so
+@so lib/mlt/libmltvmfx.so
+@so lib/mlt/libmltvorbis.so
+@so lib/mlt/libmltxml.so
lib/pkgconfig/mlt++.pc
lib/pkgconfig/mlt-framework.pc
@man man/man1/melt.1
@@ -137,8 +139,10 @@ share/mlt/feeds/PAL/example.properties
share/mlt/feeds/PAL/obscure.properties
share/mlt/frei0r/
share/mlt/frei0r/blacklist.txt
+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
@@ -156,122 +160,6 @@ share/mlt/kdenlive/filter_boxblur.yml
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
-share/mlt/lumas/NTSC/luma03.pgm
-share/mlt/lumas/NTSC/luma04.pgm
-share/mlt/lumas/NTSC/luma05.pgm
-share/mlt/lumas/NTSC/luma06.pgm
-share/mlt/lumas/NTSC/luma07.pgm
-share/mlt/lumas/NTSC/luma08.pgm
-share/mlt/lumas/NTSC/luma09.pgm
-share/mlt/lumas/NTSC/luma10.pgm
-share/mlt/lumas/NTSC/luma11.pgm
-share/mlt/lumas/NTSC/luma12.pgm
-share/mlt/lumas/NTSC/luma13.pgm
-share/mlt/lumas/NTSC/luma14.pgm
-share/mlt/lumas/NTSC/luma15.pgm
-share/mlt/lumas/NTSC/luma16.pgm
-share/mlt/lumas/NTSC/luma17.pgm
-share/mlt/lumas/NTSC/luma18.pgm
-share/mlt/lumas/NTSC/luma19.pgm
-share/mlt/lumas/NTSC/luma20.pgm
-share/mlt/lumas/NTSC/luma21.pgm
-share/mlt/lumas/NTSC/luma22.pgm
-share/mlt/lumas/PAL/
-share/mlt/lumas/PAL/luma01.pgm
-share/mlt/lumas/PAL/luma02.pgm
-share/mlt/lumas/PAL/luma03.pgm
-share/mlt/lumas/PAL/luma04.pgm
-share/mlt/lumas/PAL/luma05.pgm
-share/mlt/lumas/PAL/luma06.pgm
-share/mlt/lumas/PAL/luma07.pgm
-share/mlt/lumas/PAL/luma08.pgm
-share/mlt/lumas/PAL/luma09.pgm
-share/mlt/lumas/PAL/luma10.pgm
-share/mlt/lumas/PAL/luma11.pgm
-share/mlt/lumas/PAL/luma12.pgm
-share/mlt/lumas/PAL/luma13.pgm
-share/mlt/lumas/PAL/luma14.pgm
-share/mlt/lumas/PAL/luma15.pgm
-share/mlt/lumas/PAL/luma16.pgm
-share/mlt/lumas/PAL/luma17.pgm
-share/mlt/lumas/PAL/luma18.pgm
-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
@@ -316,6 +204,8 @@ share/mlt/presets/
share/mlt/presets/consumer/
share/mlt/presets/consumer/avformat/
share/mlt/presets/consumer/avformat/AAC
+share/mlt/presets/consumer/avformat/ALAC
+share/mlt/presets/consumer/avformat/FLAC
share/mlt/presets/consumer/avformat/Flash
share/mlt/presets/consumer/avformat/GIF
share/mlt/presets/consumer/avformat/MJPEG
@@ -400,10 +290,12 @@ share/mlt/presets/consumer/avformat/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/DNxHR-HQ
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 HQ
share/mlt/presets/consumer/avformat/intermediate/ProRes-Kostya
share/mlt/presets/consumer/avformat/lossless/
share/mlt/presets/consumer/avformat/lossless/FFV1
@@ -535,6 +427,8 @@ share/mlt/vmfx/filter_chroma_hold.yml
share/mlt/vmfx/filter_mono.yml
share/mlt/vmfx/filter_shape.yml
share/mlt/vmfx/producer_pgm.yml
+share/mlt/vorbis/
+share/mlt/vorbis/producer_vorbis.yml
share/mlt/xml/
share/mlt/xml/consumer_xml.yml
share/mlt/xml/mlt-xml.dtd
