*ping*
On Sun Nov 27, 2016 at 12:18:03PM +0100, Rafael Sadowski wrote:
> Hi,
>
> after my patch for 6.0.0 here's an update for 6.4.1. Regression tests
> are fine as well as the old ones:
>
> "Totals: 55 passed, 1 failed, 0 skipped"
>
> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/mlt/Makefile,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 Makefile
> --- Makefile 28 Apr 2016 08:20:32 -0000 1.13
> +++ Makefile 27 Nov 2016 10:54:33 -0000
> @@ -2,19 +2,17 @@
>
> COMMENT-main = multimedia transformations framework
> COMMENT-gpl2 = GPLv2-licensed modules for mlt
> -VERSION = 6.0.0
> +VERSION = 6.4.1
> DISTNAME = mlt-${VERSION}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-gpl2 = mlt-gpl2-${VERSION}
> -REVISION-main = 1
> -REVISION-gpl2 = 0
>
> # XXX versions should be kept in sync together
> SHARED_LIBS = mlt 1.1
> SHARED_LIBS += mlt++ 1.1
>
> CATEGORIES = multimedia devel
> -HOMEPAGE = http://www.mltframework.org/
> +HOMEPAGE = https://www.mltframework.org/
>
> MAINTAINER = KDE porting team <openbsd-...@googlegroups.com>
>
> @@ -24,13 +22,13 @@ MAINTAINER = KDE porting team <openbsd-
> PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB-main = ${MODGCC4_CPPWANTLIB} SDL SDL_image X11 avcodec
> -WANTLIB-main += avdevice avformat avutil c cairo exif gdk-x11-2.0
> +WANTLIB-main += avdevice avformat avutil c exif 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 pthread sox swscale xml2 fftw3
> +WANTLIB-main += pangoft2-1.0 pthread sox swscale xml2 fftw3 avfilter
> +WANTLIB-main += fontconfig
>
> -WANTLIB-gpl2 = ${MODGCC4_CPPWANTLIB} ${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
> +WANTLIB-gpl2 = ${MODGCC4_CPPWANTLIB} ${MODQT4_WANTLIB} X11 exif m
> +WANTLIB-gpl2 += mlt mlt++ pthread samplerate
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/}
> EXTRACT_SUFX = .tar.gz
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/mlt/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 3 Apr 2016 19:15:23 -0000 1.3
> +++ distinfo 27 Nov 2016 10:54:33 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470=
> -SIZE (mlt-6.0.0.tar.gz) = 1281478
> +SHA256 (mlt-6.4.1.tar.gz) = 06mS8+Z0Y+aGMMsLRV1AiioS9Np6GeRoB/oIp58JsrY=
> +SIZE (mlt-6.4.1.tar.gz) = 1344030
> 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 27 Nov 2016 10:54:33 -0000
> @@ -1,7 +1,7 @@
> $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()
> +--- configure.orig Sat Nov 12 07:27:39 2016
> ++++ configure Tue Nov 15 19:43:27 2016
> +@@ -123,6 +123,13 @@ build_config()
> echo "RDYNAMIC=-rdynamic"
> echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
> ;;
> Index: patches/patch-src_framework_Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-src_framework_Makefile
> --- patches/patch-src_framework_Makefile 14 Jul 2014 09:15:12 -0000
> 1.1.1.1
> +++ patches/patch-src_framework_Makefile 27 Nov 2016 10:54:33 -0000
> @@ -1,6 +1,6 @@
> $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
> +--- src/framework/Makefile.orig Sat Nov 12 07:27:39 2016
> ++++ src/framework/Makefile Tue Nov 15 19:43:27 2016
> @@ -1,7 +1,6 @@
> include ../../config.mak
> include config.mak
> @@ -19,7 +19,7 @@ $OpenBSD: patch-src_framework_Makefile,v
> 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 +35,7 @@ $OpenBSD: patch-src_framework_Makefile,v
>
> 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) ; \
> 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.2
> diff -u -p -u -p -r1.2 patch-src_modules_plusgpl_consumer_cbrts_c
> --- patches/patch-src_modules_plusgpl_consumer_cbrts_c 3 Apr 2016
> 19:15:23 -0000 1.2
> +++ patches/patch-src_modules_plusgpl_consumer_cbrts_c 27 Nov 2016
> 10:54:33 -0000
> @@ -1,7 +1,7 @@
> $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
> +--- src/modules/plusgpl/consumer_cbrts.c.orig Sat Nov 12 07:27:39 2016
> ++++ src/modules/plusgpl/consumer_cbrts.c Tue Nov 15 19:43:27 2016
> +@@ -254,6 +254,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.2
> diff -u -p -u -p -r1.2 patch-src_modules_qt_Makefile
> --- patches/patch-src_modules_qt_Makefile 3 Apr 2016 19:15:23 -0000
> 1.2
> +++ patches/patch-src_modules_qt_Makefile 27 Nov 2016 10:54:33 -0000
> @@ -1,8 +1,8 @@
> $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
> +--- src/modules/qt/Makefile.orig Sat Nov 12 07:27:39 2016
> ++++ src/modules/qt/Makefile Tue Nov 15 19:43:27 2016
> +@@ -33,6 +33,10 @@ ifdef USE_FFTW
> CFLAGS += -DUSE_FFTW
> endif
>
> Index: pkg/PLIST-gpl2
> ===================================================================
> RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-gpl2,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST-gpl2
> --- pkg/PLIST-gpl2 3 Apr 2016 19:15:23 -0000 1.2
> +++ pkg/PLIST-gpl2 27 Nov 2016 10:54:33 -0000
> @@ -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
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-main,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 PLIST-main
> --- pkg/PLIST-main 28 Apr 2016 08:20:32 -0000 1.6
> +++ pkg/PLIST-main 27 Nov 2016 10:54:33 -0000
> @@ -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/
> @@ -216,11 +218,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 +236,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 +248,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 +313,16 @@ share/mlt/presets/consumer/avformat/hdv_
> 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
