Build OK. Seems to work OK (tested using kdenlive). portcheck returns: 1 line(s) longer than 80 chars in Makefile in -main: the following libraries in WANTLIB-main look like masked by RUN_DEPENDS-main: xml2
Otherwise fine. Cheers. Elias. 2018-07-21 15:33 GMT-03:00 Rafael Sadowski <[email protected]>: > On Fri May 25, 2018 at 04:09:14PM +0200, Rafael Sadowski wrote: >> Hi All, >> >> Update multimedia/mlt to the latest release. The diff is based on >> the work of Matthew Martin[1]. It is required to import/replace >> x11/kde-applications/kdenlive (kdenlive-17.12.3 - Next mail) >> >> Tested with kdenlive-17.12.3 on amd64. >> >> [1]: https://marc.info/?l=openbsd-ports&m=152428861822252&w=2 >> > > New diff which switch from QT4/KDE4 to Qt5 and to the latest stable > version. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/multimedia/mlt/Makefile,v > retrieving revision 1.16 > diff -u -p -u -p -r1.16 Makefile > --- Makefile 27 Jul 2017 09:55:45 -0000 1.16 > +++ Makefile 21 Jul 2018 18:31:22 -0000 > @@ -2,19 +2,17 @@ > > COMMENT-main = multimedia transformations framework > COMMENT-gpl2 = GPLv2-licensed modules for mlt > -VERSION = 6.0.0 > +VERSION = 6.10.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 <[email protected]> > > @@ -23,45 +21,40 @@ MAINTAINER = KDE porting team <openbsd- > # file gets included, see --enable-gpl3 configure option. > PERMIT_PACKAGE_CDROM = Yes > > -WANTLIB-main = ${COMPILER_LIBCXX} SDL SDL_image X11 avcodec > -WANTLIB-main += avdevice avformat avutil c cairo exif gdk-x11-2.0 > +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 pthread sox swscale xml2 fftw3 > +WANTLIB-main += pangoft2-1.0 sox swresample swscale xml2 > > -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 > +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets > +WANTLIB += Qt5Xml SDL2 X11 exif m mlt mlt++ samplerate > > -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/} > -EXTRACT_SUFX = .tar.gz > +MASTER_SITES = > https://github.com/mltframework/mlt/releases/download/v${VERSION}/ > > MULTI_PACKAGES = -main -gpl2 > > -MODULES = x11/kde4 > -MODKDE4_USE = > -KDE4_ONLY = Yes > +MODULES = x11/qt5 > > BUILD_DEPENDS = audio/ladspa \ > - textproc/libxml>=2.5 \ > - ${MODKDE4_DEP_DIR}/libs>=${MODKDE4_DEP_VERSION} > + textproc/libxml > > RUN_DEPENDS-main = audio/ladspa \ > x11/gtk+3,-guic > > -LIB_DEPENDS-main = ${MODGCC4_CPPLIBDEP} \ > - audio/jack \ > +LIB_DEPENDS-main = audio/jack \ > audio/sox \ > - devel/sdl>=1.2 \ > - devel/sdl-image>=1.2 \ > + devel/sdl2 \ > + devel/sdl-image \ > graphics/ffmpeg \ > graphics/libexif \ > math/fftw3 \ > x11/gtk+2,-main > > LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \ > - ${MODGCC4_CPPLIBDEP} \ > - ${MODQT4_LIB_DEPENDS} \ > - audio/libsamplerate>=0.1.5 \ > + ${MODQT5_LIB_DEPENDS} \ > + x11/qt5/qtsvg \ > + devel/sdl2 \ > + audio/libsamplerate \ > graphics/libexif > > MAKE_FLAGS = soversion=${LIBmlt_VERSION} > 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 21 Jul 2018 18:31:22 -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.10.0.tar.gz) = EGQqgPgeEsbMVAXmDO1kCz3TJceT/nMgeuB94yGtaBA= > +SIZE (mlt-6.10.0.tar.gz) = 1384632 > 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 21 Jul 2018 18:31:22 -0000 > @@ -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 > 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 > > 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_framework_mlt_property_h > =================================================================== > RCS file: > /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_h,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-src_framework_mlt_property_h > --- patches/patch-src_framework_mlt_property_h 24 May 2017 16:30:52 -0000 > 1.1 > +++ patches/patch-src_framework_mlt_property_h 21 Jul 2018 18:31:22 -0000 > @@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_proper > 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__)) || HAVE_LOCALE_H > + # 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; > Index: patches/patch-src_modules_decklink_consumer_decklink_cpp > =================================================================== > RCS file: patches/patch-src_modules_decklink_consumer_decklink_cpp > diff -N patches/patch-src_modules_decklink_consumer_decklink_cpp > --- patches/patch-src_modules_decklink_consumer_decklink_cpp 21 Apr 2018 > 15:53:48 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_modules_decklink_consumer_decklink_cpp,v 1.1 2018/04/21 > 15:53:48 naddy Exp $ > - > -Index: src/modules/decklink/consumer_decklink.cpp > ---- src/modules/decklink/consumer_decklink.cpp.orig > -+++ src/modules/decklink/consumer_decklink.cpp > -@@ -554,7 +554,7 @@ class DeckLinkConsumer (public) > - { > - mlt_log_debug( getConsumer(), > - "ScheduledFrameCompleted: > GetBufferedAudioSampleFrameCount %u -> " DECKLINK_UNSIGNED_FORMAT > -- ", m_count=%"PRIu64"\n", m_acnt, cnt, m_count > ); > -+ ", m_count=%" PRIu64 "\n", m_acnt, cnt, > m_count ); > - m_acnt = cnt; > - } > - > 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 21 Jul 2018 18:31:22 > -0000 > @@ -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 ); > 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 21 Jul 2018 18:31:22 -0000 > @@ -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 > > Index: patches/patch-src_tests_test_properties_test_properties_cpp > =================================================================== > RCS file: > /cvs/ports/multimedia/mlt/patches/patch-src_tests_test_properties_test_properties_cpp,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-src_tests_test_properties_test_properties_cpp > --- patches/patch-src_tests_test_properties_test_properties_cpp 3 Apr 2016 > 19:15:23 -0000 1.2 > +++ patches/patch-src_tests_test_properties_test_properties_cpp 21 Jul 2018 > 18:31:22 -0000 > @@ -1,7 +1,8 @@ > $OpenBSD: patch-src_tests_test_properties_test_properties_cpp,v 1.2 > 2016/04/03 19:15:23 zhuk Exp $ > ---- src/tests/test_properties/test_properties.cpp.orig Mon Feb 29 20:15:28 > 2016 > -+++ src/tests/test_properties/test_properties.cpp Mon Feb 29 20:15:58 > 2016 > -@@ -23,7 +23,6 @@ > +Index: src/tests/test_properties/test_properties.cpp > +--- src/tests/test_properties/test_properties.cpp.orig > ++++ src/tests/test_properties/test_properties.cpp > +@@ -24,7 +24,6 @@ > using namespace Mlt; > > extern "C" { > 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 21 Jul 2018 18:31:22 -0000 > @@ -5,6 +5,7 @@ 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 > share/mlt/linsys/ > @@ -26,12 +27,17 @@ 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 > +share/mlt/sdl2/ > +share/mlt/sdl2/consumer_sdl2.yml > +share/mlt/sdl2/consumer_sdl2_audio.yml > share/mlt/videostab/ > share/mlt/videostab/filter_videostab.yml > share/mlt/videostab/filter_videostab2.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 21 Jul 2018 18:31:22 -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/ > @@ -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_ > 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 >
