From owner-svn-ports-all@freebsd.org Mon Aug 15 17:46:35 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 229A0BBAE14; Mon, 15 Aug 2016 17:46:35 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0080613CB; Mon, 15 Aug 2016 17:46:34 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7FHkYiQ061758; Mon, 15 Aug 2016 17:46:34 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FHkYxG061756; Mon, 15 Aug 2016 17:46:34 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201608151746.u7FHkYxG061756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 15 Aug 2016 17:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420257 - head/multimedia/mlt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 17:46:35 -0000 Author: tcberner Date: Mon Aug 15 17:46:33 2016 New Revision: 420257 URL: https://svnweb.freebsd.org/changeset/ports/420257 Log: Add a Qt5 option to multimedia/mlt multimedia/mlt has a Qt4 option specifically to support multimedia/kdenlive. Future versions of kdenlive are Qt5 based. Prepare for this by also enabling the Qt5 library being built. Convert the QT4 option into a radio-option "QT=QT4 QT5". Reviewed by: mat Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D7432 Modified: head/multimedia/mlt/Makefile head/multimedia/mlt/pkg-plist Modified: head/multimedia/mlt/Makefile ============================================================================== --- head/multimedia/mlt/Makefile Mon Aug 15 17:46:07 2016 (r420256) +++ head/multimedia/mlt/Makefile Mon Aug 15 17:46:33 2016 (r420257) @@ -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 @@ PLIST_SUB= PORTVERSION="${PORTVERSION}" 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 @@ -71,11 +73,8 @@ KDE4_CONFIGURE_WITH= kde KDE4_USE= kde4=kdelibs KDE4_IMPLIES= QT4 -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 +98,17 @@ VIDSTAB_CONFIGURE_ENABLE=vid.stab 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 \ Modified: head/multimedia/mlt/pkg-plist ============================================================================== --- head/multimedia/mlt/pkg-plist Mon Aug 15 17:46:07 2016 (r420256) +++ head/multimedia/mlt/pkg-plist Mon Aug 15 17:46:33 2016 (r420257) @@ -70,7 +70,7 @@ lib/mlt/libmltnormalize.so 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 @@ man/man1/melt.1.gz %%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