Attachment 167237 Details for Bug 207390 – Alternate patch with Qt5 support

[patch] Alternate patch with Qt5 support

mlt-qt4_qt5.diff (text/plain), 4.59 KB, created by Olivier Duchateau on 2016-02-21 10:48:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2016-02-21 10:48:36 UTC

Size: 4.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 409278)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mlt
>-PORTVERSION=	0.9.6
>+PORTVERSION=	6.0.0
> PORTREVISION?=	0
> CATEGORIES?=	multimedia
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
>@@ -37,14 +37,15 @@
> PORTDOCS=	AUTHORS ChangeLog NEWS README docs
> PORTEXAMPLES=	demo
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 \
>+OPTIONS_RADIO=	TOOLKITS
>+OPTIONS_RADIO_TOOLKITS=	QT4 QT5
>+OPTIONS_DEFINE=	DOCS EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 \
> 		SAMPLERATE SOX SWFDEC VDPAU VIDSTAB
> OPTIONS_DEFAULT=FFMPEG FREI0R GTK2 QT4 SAMPLERATE SOX SWFDEC VIDSTAB
> OPTIONS_SUB=	yes
> 
> GTK2_DESC=	Images and text rendering via GTK+ 2
>-KDE4_DESC=	Qt extra image formats support
>-QT4_DESC=	Kdenlive titles and images support via Qt 4
>+KDE4_DESC=	Qt 4 extra image formats support
> SOX_DESC=	SoX audio effects support
> VIDSTAB_DESC=	Video stabilization support via Vid.Stab
> 
>@@ -66,13 +67,19 @@
> 
> KDE4_CONFIGURE_ENV=	PATH="${KDE4_PREFIX}/bin:$$PATH"
> KDE4_CONFIGURE_WITH=	kde
>+KDE4_USE=		KDE4=kdelibs
>+KDE4_IMPLIES=		QT4
> 
> QT4_LIB_DEPENDS=	libexif.so:${PORTSDIR}/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_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
>+QT5_USE=		QT5=core,gui,xml,svg,widgets,opengl
>+QT5_CONFIGURE_ON=	--qt-libdir="${QT_LIBDIR}" \
>+			--qt-includedir="${QT_INCDIR}"
>+
> SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
> SAMPLERATE_CONFIGURE_ENABLE=resample
> 
>@@ -94,8 +101,12 @@
> BROKEN=		does not compile on sparc64 (invokes i386 asm)
> .endif
> 
>-.if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MQT4}
>-USE_KDE4+=	kdelibs
>+.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
>+CONFIGURE_ARGS+=	--enable-qt
>+PLIST_SUB+=	QT=""
>+.else
>+CONFIGURE_ARGS+=	--disable-qt
>+PLIST_SUB+=	QT="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MVDPAU} && ${PORT_OPTIONS:MFFMPEG}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 409278)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mlt-0.9.6.tar.gz) = ab999992828a03dadbf62f6a131aada776cfd7afe63a94d994877fdba31a3000
>-SIZE (mlt-0.9.6.tar.gz) = 1242448
>+SHA256 (mlt-6.0.0.tar.gz) = 317874cfc7fc528dddbb3a7a32fd46372aae22bdc4527be1cfb55c93fa66e3bd
>+SIZE (mlt-6.0.0.tar.gz) = 1281478
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 409278)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> bin/melt
> include/mlt++/Mlt.h
>+include/mlt++/MltAnimation.h
> include/mlt++/MltConsumer.h
> include/mlt++/MltDeque.h
> include/mlt++/MltEvent.h
>@@ -69,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
>@@ -86,6 +87,7 @@
> %%FFMPEG%%%%DATADIR%%/avformat/producer_avformat.yml
> %%DATADIR%%/core/consumer_multi.yml
> %%DATADIR%%/core/data_fx.properties
>+%%DATADIR%%/core/filter_audiomap.yml
> %%DATADIR%%/core/filter_audiowave.yml
> %%DATADIR%%/core/filter_brightness.yml
> %%DATADIR%%/core/filter_channelcopy.yml
>@@ -113,6 +115,7 @@
> %%DATADIR%%/core/producer_melt.yml
> %%DATADIR%%/core/producer_melt_file.yml
> %%DATADIR%%/core/producer_noise.yml
>+%%DATADIR%%/core/producer_timewarp.yml
> %%DATADIR%%/core/producer_tone.yml
> %%DATADIR%%/core/transition_composite.yml
> %%DATADIR%%/core/transition_luma.yml
>@@ -217,7 +220,9 @@
> %%DATADIR%%/plus/consumer_blipflash.yml
> %%DATADIR%%/plus/filter_affine.yml
> %%DATADIR%%/plus/filter_charcoal.yml
>+%%DATADIR%%/plus/filter_dance.yml
> %%DATADIR%%/plus/filter_dynamictext.yml
>+%%DATADIR%%/plus/filter_fft.yml
> %%DATADIR%%/plus/filter_invert.yml
> %%DATADIR%%/plus/filter_lift_gamma_gain.yml
> %%DATADIR%%/plus/filter_loudness.yml
>@@ -388,10 +393,13 @@
> %%DATADIR%%/profiles/uhd_2160p_60
> %%DATADIR%%/profiles/vcd_ntsc
> %%DATADIR%%/profiles/vcd_pal
>-%%QT4%%%%DATADIR%%/qt/producer_kdenlivetitle.yml
>-%%QT4%%%%DATADIR%%/qt/producer_qimage.yml
>-%%QT4%%%%DATADIR%%/qt/producer_qtext.yml
>-%%QT4%%%%DATADIR%%/qt/transition_vqm.yml
>+%%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

Actions: View | Diff

Attachments on bug 207390: 167236 | 167237 | 167239 | 167240