On Tue Jan 01, 2019 at 03:47:56AM +0100, Klemens Nanni wrote:
> On Sun, Dec 30, 2018 at 01:45:48PM +0100, Rafael Sadowski wrote:
> > Comments, feedback, OK?
> * melt.1 is in the sources but not installed
Good catch, fixed below.
> * can you split MAKE_ENV and TEST_ENV into one assignment per line?
... but that's to long
> * use ${MODQT_QMAKE} (Qt5) in do-test,
> `qtmak4' hardcodes a missing TDEP on qt4
fixed, Thanks!
>
> One test fails, test.log attached.
In 6.10 two tests fails so it's a progress ;)
>
> > BUILD_DEPENDS = audio/ladspa \
> > - textproc/libxml
> > + textproc/libxml \
> > + multimedia/frei0r-plugins
> >
> > RUN_DEPENDS-main = audio/ladspa \
> > - x11/gtk+3,-guic
> > + x11/gtk+3,-guic \
> > + multimedia/frei0r-plugins
> Please sort these just like LIB_DEPENDS-gpl2.
ACK; New diff below. Thanks kn@ for this very good points.
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 29 Jul 2018 15:05:35 -0000 1.17
+++ Makefile 2 Jan 2019 10:36:12 -0000
@@ -2,32 +2,32 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.10.0
+VERSION = 6.12.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 2.0
-SHARED_LIBS += mlt++ 2.0
+SHARED_LIBS = mlt 3.0
+SHARED_LIBS += mlt++ 3.0
CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
-MAINTAINER = KDE porting team <[email protected]>
+MAINTAINER = Rafael Sadowski <[email protected]>
# GPLv2+, LGPLv2.1+
# Actually, qimage module could be under GPLv3+ if one more object
# file gets included, see --enable-gpl3 configure option.
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB-main += ${COMPILER_LIBCXX} SDL SDL2 SDL_image X11 avcodec avdevice
+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 += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml SDL2 X11 exif m mlt mlt++ samplerate
+WANTLIB += Qt5Xml SDL2 exif m mlt mlt++ samplerate
MASTER_SITES =
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
@@ -36,15 +36,17 @@ MULTI_PACKAGES = -main -gpl2
MODULES = x11/qt5
BUILD_DEPENDS = audio/ladspa \
+ multimedia/frei0r-plugins \
textproc/libxml
RUN_DEPENDS-main = audio/ladspa \
+ multimedia/frei0r-plugins \
x11/gtk+3,-guic
LIB_DEPENDS-main = audio/jack \
audio/sox \
- devel/sdl2 \
devel/sdl-image \
+ devel/sdl2 \
graphics/ffmpeg \
graphics/libexif \
math/fftw3 \
@@ -52,32 +54,34 @@ LIB_DEPENDS-main = audio/jack \
LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
${MODQT5_LIB_DEPENDS} \
- x11/qt5/qtsvg \
- devel/sdl2 \
audio/libsamplerate \
- graphics/libexif
+ devel/sdl2 \
+ graphics/libexif \
+ x11/qt5/qtsvg
MAKE_FLAGS = soversion=${LIBmlt_VERSION}
MAKE_ENV = LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
- SHFLAGS="-shared" CXX=${CXX}
+ SHFLAGS="-shared" CXX=${CXX}
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --mandir=${PREFIX}/man \
--disable-dv \
- --disable-frei0r \
--disable-kino \
--disable-swfdec \
--enable-gpl
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${PREFIX}/man/man1/
+
# one test fails due to lack of support of locale-specific numeric formatting
TEST_DEPENDS = ${BUILD_PKGPATH},-main
TEST_FLAGS = -e
# LFLAGS is not a typo
TEST_ENV = COPTS="${CXXFLAGS}" LFLAGS="${LDFLAGS} -pthread"
do-test:
- cd ${WRKSRC}/src/tests; ${SETENV} ${ALL_TEST_ENV} qmake4 tests.pro
+ cd ${WRKSRC}/src/tests; ${SETENV} ${ALL_TEST_ENV} ${MODQT_QMAKE}
tests.pro
cd ${WRKSRC}/src/tests; ${SETENV} ${ALL_TEST_ENV} ${MAKE_PROGRAM} \
- ${ALL_TEST_FLAGS} clean all check
+ ${ALL_TEST_FLAGS} clean all check
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 29 Jul 2018 15:05:35 -0000 1.4
+++ distinfo 2 Jan 2019 10:36:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.10.0.tar.gz) = EGQqgPgeEsbMVAXmDO1kCz3TJceT/nMgeuB94yGtaBA=
-SIZE (mlt-6.10.0.tar.gz) = 1384632
+SHA256 (mlt-6.12.0.tar.gz) = BTBFBOHcIf6ebDQZC3D6OOa9zoU0BBZu5+BQS2eN3A8=
+SIZE (mlt-6.12.0.tar.gz) = 1395646
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/multimedia/mlt/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 29 Jul 2018 15:05:35 -0000 1.7
+++ pkg/PLIST-main 2 Jan 2019 10:36:12 -0000
@@ -63,6 +63,7 @@ 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
@@ -74,6 +75,7 @@ lib/mlt/libmltvmfx.so
lib/mlt/libmltxml.so
lib/pkgconfig/mlt++.pc
lib/pkgconfig/mlt-framework.pc
+@man man/man1/melt.1
share/mlt/
share/mlt/avformat/
share/mlt/avformat/blacklist.txt
@@ -131,6 +133,10 @@ share/mlt/feeds/PAL/data_fx.properties
share/mlt/feeds/PAL/etv.properties
share/mlt/feeds/PAL/example.properties
share/mlt/feeds/PAL/obscure.properties
+share/mlt/frei0r/
+share/mlt/frei0r/blacklist.txt
+share/mlt/frei0r/not_thread_safe.txt
+share/mlt/frei0r/param_name_map.yaml
share/mlt/gtk2/
share/mlt/gtk2/consumer_gtk2_preview.yml
share/mlt/gtk2/filter_rescale.yml
@@ -229,6 +235,9 @@ 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
+share/mlt/plus/filter_spot_remover.yml
+share/mlt/plus/filter_text.yml
+share/mlt/plus/filter_timer.yml
share/mlt/plus/producer_blipflash.yml
share/mlt/plus/producer_count.yml
share/mlt/plus/transition_affine.yml
@@ -250,6 +259,11 @@ 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/alpha/
+share/mlt/presets/consumer/avformat/alpha/Quicktime Animation
+share/mlt/presets/consumer/avformat/alpha/Ut Video
+share/mlt/presets/consumer/avformat/alpha/vp8
+share/mlt/presets/consumer/avformat/alpha/vp9
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/
@@ -324,6 +338,7 @@ share/mlt/presets/consumer/avformat/loss
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/Ut Video
share/mlt/presets/consumer/avformat/stills/
share/mlt/presets/consumer/avformat/stills/BMP
share/mlt/presets/consumer/avformat/stills/DPX
@@ -411,6 +426,8 @@ share/mlt/profiles/quarter_pal
share/mlt/profiles/quarter_pal_wide
share/mlt/profiles/sdi_486i_5994
share/mlt/profiles/sdi_486p_2398
+share/mlt/profiles/square_1080p_30
+share/mlt/profiles/square_1080p_60
share/mlt/profiles/square_ntsc
share/mlt/profiles/square_ntsc_wide
share/mlt/profiles/square_pal
