From owner-svn-ports-branches@freebsd.org Wed Dec 7 16:43:53 2016 Return-Path: Delivered-To: svn-ports-branches@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 0C735C6C98D; Wed, 7 Dec 2016 16:43:53 +0000 (UTC) (envelope-from rakuco@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 DB4C9628; Wed, 7 Dec 2016 16:43:52 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB7Ghqhu061706; Wed, 7 Dec 2016 16:43:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB7Ghqc6061705; Wed, 7 Dec 2016 16:43:52 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201612071643.uB7Ghqc6061705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 7 Dec 2016 16:43:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428077 - branches/2016Q4/audio/amarok-kde4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2016 16:43:53 -0000 Author: rakuco Date: Wed Dec 7 16:43:51 2016 New Revision: 428077 URL: https://svnweb.freebsd.org/changeset/ports/428077 Log: MFH: r427906 r427909 Switch to USES=mysql:embedded PR: 214184 Submitted by: matthew@reztek.cz Add several missing dependencies to the port. `make stage-qa' was complaining about a lot of missing dependencies: - Amarok actually links against MySQL, so we need USES=mysql, not USES=mysql:embedded. - Add USE_KDE=soprano and USE_GL=gl. - Add several missing X11 dependencies that were being pulled indirectly. - The IPOD option causes the iPod plugin to link against a few other libraries via libgpod-1.0.pc, so add them. - The MP3TUNES option needs either libgcrypt or OpenSSL; explicitly disable libgcrypt and add USES=ssl as required. - Fix a capitalization typo in MP3TUNES_CMAKE_OFF that was preventing the MP3Tunes code from being properly disabled in CMake. Based on an initial patch sent by Matthey Rezny . PR: 214184 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/audio/amarok-kde4/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/audio/amarok-kde4/Makefile ============================================================================== --- branches/2016Q4/audio/amarok-kde4/Makefile Wed Dec 7 16:25:44 2016 (r428076) +++ branches/2016Q4/audio/amarok-kde4/Makefile Wed Dec 7 16:43:51 2016 (r428077) @@ -3,7 +3,7 @@ PORTNAME= amarok PORTVERSION= 2.8.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src @@ -22,14 +22,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plug RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \ ${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms -USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2 -USE_KDE= kdelibs libkcddb libkcompactdisc \ - nepomuk-core runtime automoc4 strigi -USE_MYSQL= embedded +USES= cmake kde:4 mysql pkgconfig \ + shared-mime-info shebangfix tar:bzip2 +USE_GL= gl +USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \ + nepomuk-core runtime soprano strigi USE_QT4= corelib dbus designer gui network opengl \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build -USE_XORG= x11 +USE_XORG= ice sm x11 xau xdmcp xext xft xpm SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl USE_LDCONFIG= yes @@ -43,7 +44,9 @@ AMAZON_DESC= Amazon MP3 store support v AMAZON_RUN_DEPENDS= clamz:net/clamz IPOD_DESC= Apple iPod support -IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod +IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ + libimobiledevice.so:comms/libimobiledevice \ + libplist.so:devel/libplist IPOD_USE= GNOME=gdkpixbuf2,glib20 IPOD_CMAKE_OFF= -DWITH_IPOD:BOOL=Off @@ -51,7 +54,10 @@ MP3TUNES_DESC= MP3tunes support MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \ libcurl.so:ftp/curl MP3TUNES_USE= GNOME=glib20,libxml2 -MP3TUNES_CMAKE_OFF= -DWITH_MP3tunes:BOOL=Off +MP3TUNES_USES= ssl +MP3TUNES_CMAKE_ON= -DWITH_MP3Tunes:BOOL=ON \ + -DWITH_Libgcrypt:BOOL=OFF +MP3TUNES_CMAKE_OFF= -DWITH_MP3Tunes:BOOL=Off MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_OFF= -DWITH_Mtp:BOOL=Off