Index: multimedia/mlt/Makefile =================================================================== --- multimedia/mlt/Makefile +++ multimedia/mlt/Makefile @@ -2,7 +2,7 @@ PORTNAME= mlt PORTVERSION= 6.2.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} @@ -38,8 +38,10 @@ PORTDOCS= AUTHORS ChangeLog NEWS README docs PORTEXAMPLES= demo -OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 \ +OPTIONS_DEFINE= DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 \ SAMPLERATE SOX SWFDEC VDPAU VIDSTAB +OPTIONS_RADIO= QT +OPTIONS_RADIO_QT= QT4 QT5 OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VDPAU VIDSTAB OPTIONS_SUB= yes @@ -70,12 +72,11 @@ KDE4_CONFIGURE_WITH= kde KDE4_USE= kde4=kdelibs KDE4_IMPLIES= QT4 +KDE4_PREVENTS= QT5 +KDE4_PREVENTS_MSG= KDE4 implies Qt4 conflicting with Qt5 -QT4_LIB_DEPENDS= libexif.so:graphics/libexif QT4_USE= QT4=corelib,gui,opengl,svg,xml -QT4_CONFIGURE_ENABLE= qt -QT4_CONFIGURE_ON= --qt-libdir="${QT_LIBDIR}" \ - --qt-includedir="${QT_INCDIR}" +QT5_USE= QT5=core,gui,opengl,svg,xml SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE=resample @@ -99,6 +100,17 @@ BROKEN= does not compile on sparc64 (invokes i386 asm) .endif +.if ${PORT_OPTIONS:MQT[45]} +LIB_DEPENDS+= libexif.so:graphics/libexif +CONFIGURE_ARGS+= --enable-qt \ + --qt-libdir="${QT_LIBDIR}" \ + --qt-includedir="${QT_INCDIR}" +PLIST_SUB+= QT="" +.else +CONFIGURE_ARGS+= --disable-qt +PLIST_SUB+= QT="@comment " +.endif + pre-configure: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ ${WRKSRC}/src/modules/avformat/vdpau.c \ Index: multimedia/mlt/pkg-plist =================================================================== --- multimedia/mlt/pkg-plist +++ multimedia/mlt/pkg-plist @@ -70,7 +70,7 @@ lib/mlt/libmltoldfilm.so lib/mlt/libmltplus.so lib/mlt/libmltplusgpl.so -%%QT4%%lib/mlt/libmltqt.so +%%QT%%lib/mlt/libmltqt.so %%SAMPLERATE%%lib/mlt/libmltresample.so lib/mlt/libmltsdl.so %%SOX%%lib/mlt/libmltsox.so @@ -397,13 +397,13 @@ %%DATADIR%%/profiles/uhd_2160p_60 %%DATADIR%%/profiles/vcd_ntsc %%DATADIR%%/profiles/vcd_pal -%%QT4%%%%DATADIR%%/qt/filter_audiospectrum.yml -%%QT4%%%%DATADIR%%/qt/filter_audiowaveform.yml -%%QT4%%%%DATADIR%%/qt/filter_lightshow.yml -%%QT4%%%%DATADIR%%/qt/producer_kdenlivetitle.yml -%%QT4%%%%DATADIR%%/qt/producer_qimage.yml -%%QT4%%%%DATADIR%%/qt/producer_qtext.yml -%%QT4%%%%DATADIR%%/qt/transition_vqm.yml +%%QT%%%%DATADIR%%/qt/filter_audiospectrum.yml +%%QT%%%%DATADIR%%/qt/filter_audiowaveform.yml +%%QT%%%%DATADIR%%/qt/filter_lightshow.yml +%%QT%%%%DATADIR%%/qt/producer_kdenlivetitle.yml +%%QT%%%%DATADIR%%/qt/producer_qimage.yml +%%QT%%%%DATADIR%%/qt/producer_qtext.yml +%%QT%%%%DATADIR%%/qt/transition_vqm.yml %%SAMPLERATE%%%%DATADIR%%/resample/filter_resample.yml %%DATADIR%%/sdl/consumer_sdl.yml %%DATADIR%%/sdl/consumer_sdl_audio.yml