svn commit: r453473 - in head/audio/amarok-kde4: . files

[David Naylor]

Author: dbn
Date: Sat Nov  4 17:13:34 2017
New Revision: 453473
URL: https://svnweb.freebsd.org/changeset/ports/453473

Log:
  audio/amarok-kde4: fix local collections not working
  
  The local collection backend uses embedded MySQL, however mysqle needs
  to be linked against SSL.
  
  Also, explicitly state we need both client and embedded version of mysql
  in USES.
  
  PR:		218821
  PR:		221467

Added:
  head/audio/amarok-kde4/files/patch-src_core-impl_collections-db-sql-mysqlcollection-CMakeLists.txt   (contents, props changed)
Modified:
  head/audio/amarok-kde4/Makefile

Modified: head/audio/amarok-kde4/Makefile
==============================================================================
--- head/audio/amarok-kde4/Makefile	Sat Nov  4 16:39:13 2017	(r453472)
+++ head/audio/amarok-kde4/Makefile	Sat Nov  4 17:13:34 2017	(r453473)
@@ -3,13 +3,16 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.8.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE music player
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libtag-extras.so:audio/taglib-extras \
 		liblastfm.so:audio/liblastfm \
@@ -20,8 +23,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/lib
 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:outsource kde:4 mysql pkgconfig \
-		shared-mime-info shebangfix tar:bzip2
+USES=		cmake:outsource kde:4 mysql:client,embedded pkgconfig \
+		shared-mime-info shebangfix ssl tar:bzip2
 USE_GL=		gl
 USE_KDE=	automoc4 kdelibs libkcddb libkcompactdisc \
 		nepomuk-core runtime soprano strigi
@@ -31,7 +34,7 @@ USE_QT4=	corelib dbus designer gui network opengl \
 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
-CMAKE_ARGS=	-DWITH_FFmpeg:BOOL=off
+CMAKE_ARGS=	-DWITH_FFmpeg:BOOL=off -DOPENSSL_ROOT_DIR=${OPENSSLBASE}
 
 BROKEN_sparc64=	does not build (GCC-related error)
 

Added: head/audio/amarok-kde4/files/patch-src_core-impl_collections-db-sql-mysqlcollection-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/amarok-kde4/files/patch-src_core-impl_collections-db-sql-mysqlcollection-CMakeLists.txt	Sat Nov  4 17:13:34 2017	(r453473)
@@ -0,0 +1,12 @@
+--- src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt.orig	2017-09-27 16:37:16 UTC
++++ src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt
+@@ -29,7 +29,8 @@ target_link_libraries(amarok_collection-
+ )
+ 
+ if(NOT WIN32 AND NOT APPLE)
+-    target_link_libraries( amarok_collection-mysqlecollection crypt pthread )
++    find_package( OpenSSL REQUIRED )
++    target_link_libraries( amarok_collection-mysqlecollection crypt pthread ${OPENSSL_SSL_LIBRARY} )
+ endif(NOT WIN32 AND NOT APPLE)
+ 
+ if(APPLE)