From owner-svn-ports-all@freebsd.org Fri Jan 29 21:54:07 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 5F193A73BB0; Fri, 29 Jan 2016 21:54:07 +0000 (UTC) (envelope-from olivierd@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 3A2DB106F; Fri, 29 Jan 2016 21:54:07 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0TLs63H057902; Fri, 29 Jan 2016 21:54:06 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TLs66J057900; Fri, 29 Jan 2016 21:54:06 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201601292154.u0TLs66J057900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Fri, 29 Jan 2016 21:54:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407497 - head/multimedia/qmmp 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.20 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: Fri, 29 Jan 2016 21:54:07 -0000 Author: olivierd Date: Fri Jan 29 21:54:05 2016 New Revision: 407497 URL: https://svnweb.freebsd.org/changeset/ports/407497 Log: Update to 0.9.7 Changelog: http://sourceforge.net/p/qmmp-dev/code/HEAD/tree/tags/qmmp-0.9.7/ChangeLog PR: 206669 Submitted by: (maintainer) Modified: head/multimedia/qmmp/Makefile head/multimedia/qmmp/distinfo Modified: head/multimedia/qmmp/Makefile ============================================================================== --- head/multimedia/qmmp/Makefile Fri Jan 29 21:13:47 2016 (r407496) +++ head/multimedia/qmmp/Makefile Fri Jan 29 21:54:05 2016 (r407497) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.7 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ @@ -13,7 +13,7 @@ LICENSE= GPLv2 CONFLICTS= ${PORTNAME}-qt5-1.* -USES= cmake:outsource desktop-file-utils pkgconfig tar:bzip2 +USES= cmake:outsource desktop-file-utils pathfix pkgconfig tar:bzip2 USE_QT4= corelib gui network xml \ linguisttools_build moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes @@ -51,14 +51,12 @@ PLUGIN_NETWORKING_DESC= Features via the OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_RADIO= MPLAYER -OPTIONS_RADIO_MPLAYER= MPLAYER1 MPLAYER2 -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \ - MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK NOTIFIER NULLOUT \ + MMS MODPLUG MPRIS MPLAYER1 MUSEPACK NOTIFIER NULLOUT \ OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI RGSCAN \ SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \ TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI @@ -137,11 +135,9 @@ ENCA_CMAKE_OFF= -DUSE_ENCA:BOOL=FALSE MPLAYER1_DESC= mplayer-1.1.x (multimedia/mplayer) MPLAYER2_DESC= mplayer-2.0.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -MPLAYER1_IMPLIES= MPLAYER MPLAYER2_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer2 -MPLAYER2_IMPLIES= MPLAYER -MPLAYER_CMAKE_ON= -DUSE_MPLAYER:BOOL=TRUE -MPLAYER_CMAKE_OFF= -DUSE_MPLAYER:BOOL=FALSE +MPLAYER1_PREVENTS= MPLAYER2 +MPLAYER2_PREVENTS= MPLAYER1 PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:${PORTSDIR}/graphics/libprojectm @@ -311,8 +307,17 @@ QMMP_DIALOG_CMAKE_OFF= -DUSE_QMMP_DIALOG .include +.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} +CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=TRUE +PLIST_SUB+= MPLAYER="" +.else +CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=FALSE +PLIST_SUB+= MPLAYER="@comment " +.endif + PLIST_SUB+= SHLIB_VER=${PORTVERSION:C/-.*//} +PATHFIX_CMAKELISTSTXT= \\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\" PORTDOCS= README README.RUS AUTHORS INSTALLS_ICONS= yes @@ -325,10 +330,6 @@ post-patch: @${GREP} -L '${LOCALBASE}/lib/oss' \ ${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \ ${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' - @${GREP} -L 'libdata/pkgconfig' \ - ${WRKSRC}/src/qmmp/CMakeLists.txt \ - ${WRKSRC}/src/qmmpui/CMakeLists.txt | ${XARGS} \ - ${REINPLACE_CMD} -e '/pkgconfig/s|\$${LIB_DIR}|libdata|' pre-configure: @${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt Modified: head/multimedia/qmmp/distinfo ============================================================================== --- head/multimedia/qmmp/distinfo Fri Jan 29 21:13:47 2016 (r407496) +++ head/multimedia/qmmp/distinfo Fri Jan 29 21:54:05 2016 (r407497) @@ -1,2 +1,2 @@ -SHA256 (qmmp-0.9.6.tar.bz2) = 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b -SIZE (qmmp-0.9.6.tar.bz2) = 1124762 +SHA256 (qmmp-0.9.7.tar.bz2) = 339f260c8fac0c1ddcf4205b852724c0633e63a39d83ee1906b9661ef821bcdc +SIZE (qmmp-0.9.7.tar.bz2) = 1125295