Update clementine-player to Upstream Release 1.3.1:

https://github.com/clementine-player/Clementine/releases

Requires the sqlite port to have FTS3_TOKENIZER enabled. Add a note
to UPDATING about this.

Fixes so many bugs, that its hard to keep up.

Add PulseAudio support.

Add Microsoft SkyDrive Support.

Add Amazon Cloud Drive Support.

Require the use of security/cryptopp for lastFM.

Update to gstreamer1.

Sort options and Makefile a bit.

Fix typo in MTP_DEVICE.

Upstream has fixed CD playback on FreeBSD.

Differential Revision:	https://reviews.freebsd.org/D6200

UPDATING

@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160511:
+  AFFECTS: Users of audio/clementine-player
+  AUTHOR: sbruno@FreeBSD.org
+
+  The audio/clementine-player port has been updated to v1.3.1, the latest
+  upstream release.  The music database code now has a hard dependency on
+  databases/sqlite having the FTS3_TOKENIZER option enabled.  This has 
+  been made the default option in databases/sqlite.
+
+  Without this option, clementine-player will crash on startup.
+
 20160510:
   AFFECTS: Users of biology/seqan
   AUTHOR: junovitch@FreeBSD.org

audio/clementine-player/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clementine
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3.1
-PORTREVISION=	9
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
@@ -13,70 +12,140 @@ COMMENT=	Cross-platform music player based on Amarok 1.4
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libchromaprint.so:audio/chromaprint \
 		libprotobuf.so:devel/protobuf \
 		libqca.so:devel/qca \
 		libqjson.so:devel/qjson \
 		libfftw3.so:math/fftw3 \
-		libechonest.so:audio/libechonest
+		libechonest.so:audio/libechonest \
-
+		libcryptopp.so:security/cryptopp
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_PROJECT=	Clementine
 
-USES=		compiler:c++11-lib cmake desktop-file-utils execinfo \
+USES=		cmake \
-		gettext-tools pkgconfig
+		compiler:c++11-lib \
+		desktop-file-utils \
+		execinfo \
+		gettext-tools \
+		pkgconfig \
+		sqlite
+
 USE_GL=		glew
-USE_QT4=	dbus gui xml qmake_build uic_build moc_build rcc_build \
+
-		linguist_build network sql opengl qtestlib corelib webkit \
+CONFLICTS_BUILD=	qt-3.*
-		imageformats
+USE_QT4=	corelib \
+		dbus \
+		gui \
+		imageformats \
+		qmake_build \
+		linguist_build \
+		moc_build \
+		network \
+		opengl \
+		qtestlib \
+		rcc_build \
+		sql \
+		uic_build \
+		webkit \
+		xml
+
+USE_GSTREAMER1=	cdparanoia \
+		chromaprint \
+		faac \
+		faad \
+		flac \
+		lame \
+		mad \
+		neon \
+		shout2 \
+		soup \
+		taglib \
+		twolame \
+		vorbis
 
 INSTALLS_ICONS=	yes
-USE_GSTREAMER=	gio ogg mp3 flac soup vorbis
-CONFLICTS_BUILD=	qt-3.*
 
-CFLAGS+=	-Wno-deprecated-register
+CFLAGS+=	-Wno-inconsistent-missing-override \
+		-Wno-unused-variable \
+		-Wno-unused-function
 
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
-		-DENABLE_DBUS=ON -DENABLE_SPARKLE=OFF \
+		-DENABLE_DBUS=ON \
-		-DENABLE_SOUNDMENU=OFF -DENABLE_SPOTIFY_BLOB=OFF \
+		-DENABLE_SPOTIFY_BLOB=OFF \
-		-DENABLE_UBUNTU_ONE=OFF -DENABLE_SKYDRIVE=OFF
+		-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
+		-DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+		-DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_LDFLAGS=-lcryptopp \
+		-DCRYPTOPP_LIBRARIES=cryptopp \
+		-DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
+		-DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+		-DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_FOUND=1
 
-OPTIONS_DEFINE=		AUDIOCD BREAKPAD DEVICEKIT DROPBOX BOX GIO GOOGLE_DRIVE \
+OPTIONS_DEFINE=		AMAZON \
-			GPOD LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
+			AUDIOCD \
+			BOX \
+			BREAKPAD \
+			DEVICEKIT \
+			DROPBOX \
+			GIO \
+			GOOGLE_DRIVE \
+			GPOD \
+			LASTFM \
+			MOODBAR \
+			MTP \
+			PULSEAUDIO \
+			SKYDRIVE \
+			VISUALISATION \
+			WIIMOTEDEV
 
 OPTIONS_SUB=		VISUALISATION
 
+AMAZON_DESC=		Amazon Drive support
 AUDIOCD_DESC=		Devices: Audio CD support
-BREAKPAD_DESC=		Crash reporting
 BOX_DESC=		Box Drive support
+BREAKPAD_DESC=		Crash reporting
 DEVICEKIT_DESC=		Devices: DeviceKit backend
 DROPBOX_DESC=		Dropbox Support
 GIO_DESC=		Devices: GIO device backend
 GOOGLE_DRIVE_DESC=	Google Drive support
 GPOD_DESC=		iPod support
 LASTFM_DESC=		Support Last.fm service (requires ruby)
+MOODBAR_DESC=		Moodbar Support
 MTP_DESC=		MTP device support
+PULSEAUDIO_DESC=	Enable Pulseaudio Support
+SKYDRIVE_DESC=		Microsoft SkyDrive Support
 VISUALISATION_DESC=	Visualisations from projectM
 WIIMOTEDEV_DESC=	Wiimote support
-MOODBAR_DESC=		Moodbar Support
 
-OPTIONS_DEFAULT=	AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \
+OPTIONS_DEFAULT=	AMAZON \
-			LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
+			AUDIOCD \
+			BOX \
+			DEVICEKIT \
+			DROPBOX \
+			GIO \
+			GOOGLE_DRIVE \
+			GPOD \
+			LASTFM \
+			MOODBAR \
+			MTP \
+			SKYDRIVE \
+			VISUALISATION \
+			WIIMOTEDEV
 
-DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
+AMAZON_CMAKE_ON=	-DENABLE_AMAZON_CLOUD_DRIVE=ON
-DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
+AMAZON_CMAKE_OFF=	-DENABLE_AMAZON_CLOUD_DRIVE=OFF
-
-MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
-MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF
 
 AUDIOCD_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 AUDIOCD_CMAKE_ON=	-DENABLE_AUDIOCD=ON
 AUDIOCD_CMAKE_OFF=	-DENABLE_AUDIOCD=OFF
 
+BOX_BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
 BOX_CMAKE_ON=		-DENABLE_BOX=ON
 BOX_CMAKE_OFF=		-DENABLE_BOX=OFF
 
@@ -86,6 +155,10 @@ BREAKPAD_CMAKE_OFF=	-DENABLE_BREAKPAD=OFF
 DEVICEKIT_CMAKE_ON=	-DENABLE_DEVICEKIT=ON
 DEVICEKIT_CMAKE_OFF=	-DENABLE_DEVICEKIT=OFF
 
+DROPBOX_BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
+DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
+DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
+
 GIO_USE=		GNOME=glib20
 GIO_CMAKE_ON=		-DENABLE_GIO=ON
 GIO_CMAKE_OFF=		-DENABLE_GIO=OFF
@@ -94,7 +167,9 @@ GOOGLE_DRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
 GOOGLE_DRIVE_CMAKE_ON=	-DENABLE_GOOGLE_DRIVE=ON
 GOOGLE_DRIVE_CMAKE_OFF=	-DENABLE_GOOGLE_DRIVE=OFF
 
-GPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
+GPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
+			libplist.so:devel/libplist \
+			libusbmuxd.so:comms/libusbmuxd
 GPOD_CMAKE_ON=		-DENABLE_LIBGPOD=ON
 GPOD_CMAKE_OFF=		-DENABLE_LIBGPOD=OFF
 
@@ -102,10 +177,21 @@ LASTFM_LIB_DEPENDS=	liblastfm.so:audio/liblastfm
 LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
 LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF
 
-MPT_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
+MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
+MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF
+
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_ON=		-DENABLE_LIBMTP=ON
 MTP_CMAKE_OFF=		-DENABLE_LIBMTP=OFF
 
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_ON=	-DENABLE_LIBPULSE=ON
+PULSEAUDIO_CMAKE_OFF=	-DENABLE_LIBPULSE=OFF
+
+SKYDRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
+SKYDRIVE_CMAKE_ON=	-DENABLE_SKYDRIVE=ON
+SKYDRIVE_CMAKE_OFF=	-DENABLE_SKYDRIVE=OFF
+
 VISUALISATION_CMAKE_ON=	-DENABLE_VISUALISATIONS=ON
 VISUALISATION_CMAKE_OFF=-DENABLE_VISUALISATIONS=OFF
 

audio/clementine-player/distinfo

@@ -1,2 +1,2 @@
-SHA256 (clementine-player-Clementine-1.2.3_GH0.tar.gz) = 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf
+SHA256 (clementine-player-Clementine-1.3.1_GH0.tar.gz) = f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
-SIZE (clementine-player-Clementine-1.2.3_GH0.tar.gz) = 9076977
+SIZE (clementine-player-Clementine-1.3.1_GH0.tar.gz) = 8501827

audio/clementine-player/files/patch-dist_clementine.desktop

@@ -1,13 +1,13 @@
---- dist/clementine.desktop.orig	2011-12-31 16:23:15.690338600 +0000
+--- dist/clementine.desktop.orig	2016-04-19 15:08:35 UTC
-+++ dist/clementine.desktop	2011-12-31 16:23:58.392741839 +0000
++++ dist/clementine.desktop
-@@ -6,8 +6,8 @@
+@@ -26,8 +26,8 @@ Comment[sr]=Репродукује муÐ
- GenericName[pt]=Reprodutor de músicas Clementine
+ Comment[sr@ijekavian]=Репродукује музику и last.fm токове
- Comment=Plays music and last.fm streams
+ Comment[sr@ijekavianlatin]=Reprodukuje muziku i last.fm tokove
- Comment[pt]=Reprodução de músicas e emissões last.fm
+ Comment[sr@latin]=Reprodukuje muziku i last.fm tokove
 -Exec=clementine %U
 -TryExec=clementine
 +Exec=clementine-player %U
 +TryExec=clementine-player
- Icon=application-x-clementine
+ Icon=clementine
  Terminal=false
- Categories=AudioVideo;Player;Qt;
+ Categories=AudioVideo;Player;Qt;Audio;

audio/clementine-player/files/patch-src_CMakeLists.txt

@@ -1,36 +1,6 @@
-Includes the following upstream commit to fix the build with CMake 3.0+:
+--- src/CMakeLists.txt.orig	2016-04-19 15:08:35 UTC
-
++++ src/CMakeLists.txt
-commit ec580cb815c16ec1ab43a469d5af7d51d8d03082
+@@ -1388,6 +1388,7 @@ add_executable(clementine
-Author: Chocobozzz <florian.chocobo@gmail.com>
-Date:   Wed Jul 16 15:57:25 2014 +0200
-
-    No namespaces for DBus interfaces. Fixes #4401
---- src/CMakeLists.txt.orig	2013-10-20 17:40:58.416968707 +0000
-+++ src/CMakeLists.txt	2013-10-20 17:41:24.671967496 +0000
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
-   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
- 
--  # Hack to get it to generate interfaces without namespaces - required
--  # because otherwise org::freedesktop::UDisks and
--  # org::freedesktop::UDisks::Device conflict.
--  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
-   # MPRIS DBUS interfaces
-   qt4_add_dbus_adaptor(SOURCES
-       dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
- 
-   # DeviceKit DBUS interfaces
-   if(HAVE_DEVICEKIT)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisks)
-+    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
-     qt4_add_dbus_interface(SOURCES
-         dbus/org.freedesktop.UDisks.xml
-         dbus/udisks)
-@@ -1322,6 +1322,7 @@
  
  if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
    target_link_libraries(clementine execinfo)

audio/clementine-player/files/patch-src__library_groupbydialog.h

@@ -1,11 +0,0 @@
---- ./src/library/groupbydialog.h.orig	2014-05-25 10:38:37.378768447 -0700
-+++ ./src/library/groupbydialog.h	2014-05-25 10:39:12.641759778 -0700
-@@ -22,6 +22,8 @@
- 
- #include <memory>
- 
-+#include <functional>
-+
- using std::placeholders::_1;
- using std::placeholders::_2;
- 

audio/clementine-player/files/patch-src__mainwindow.cpp

@@ -1,11 +0,0 @@
---- src/ui/mainwindow.cpp	2013-09-26 04:08:05.000000000 -0700
-+++ src/ui/mainwindow.cpp.new	2014-03-19 07:30:06.648733063 -0700
-@@ -920,7 +920,7 @@
-   if (ui_->action_toggle_scrobbling->isVisible())
-     SetToggleScrobblingIcon(value);
- 
--  if (!app_->player()->GetState() == Engine::Idle) {
-+  if (!(app_->player()->GetState() == Engine::Idle)) {
-     return;
-   }
-   else {

audio/clementine-player/files/patch-src__podcasts__podcastdownloader.h

@@ -1,11 +0,0 @@
---- ./src/podcasts/podcastdownloader.h.orig	2013-11-24 16:04:26.803673091 -0800
-+++ ./src/podcasts/podcastdownloader.h	2013-11-24 16:04:40.226672104 -0800
-@@ -27,6 +27,8 @@
- #include <QRegExp>
- #include <QSet>
- 
-+#include <sys/time.h>
-+
- class Application;
- class PodcastBackend;
- 

audio/clementine-player/files/patch-src_internet_vk_vkconnection.h

@@ -0,0 +1,11 @@
+--- src/internet/vk/vkconnection.h.orig	2016-04-19 15:08:35 UTC
++++ src/internet/vk/vkconnection.h
+@@ -19,6 +19,8 @@
+ #ifndef INTERNET_VK_VKCONNECTION_H_
+ #define INTERNET_VK_VKCONNECTION_H_
+ 
++#include <time.h>
++
+ #include "vreen/client.h"
+ #include "vreen/connection.h"
+ 

audio/clementine-player/files/patch-src_ripper_ripper.h

@@ -0,0 +1,13 @@
+--- src/ripper/ripper.h.orig	2016-04-19 15:08:35 UTC
++++ src/ripper/ripper.h
+@@ -18,9 +18,9 @@
+ #ifndef SRC_RIPPER_RIPPER_H_
+ #define SRC_RIPPER_RIPPER_H_
+ 
+-#include <cdio/cdio.h>
+ #include <QMutex>
+ #include <QObject>
++#include <cdio/cdio.h>
+ 
+ #include "core/song.h"
+ #include "core/tagreaderclient.h"