Permalink
Browse files

Update audio/clementine-player to 1.2.0

This now works on 11-current

PR:	ports/178687
  • Loading branch information...
1 parent 9e8e498 commit d22838d190f38a78a255f571df745ef2a4f97989 @seanbruno seanbruno committed Nov 30, 2013
@@ -1,9 +1,8 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
+o Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
# $FreeBSD$
PORTNAME= clementine
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -player
@@ -16,9 +15,10 @@ LICENSE= GPLv3
LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
tag:${PORTSDIR}/audio/taglib \
chromaprint:${PORTSDIR}/audio/chromaprint \
- protobuf-lite:${PORTSDIR}/devel/protobuf \
+ protobuf:${PORTSDIR}/devel/protobuf \
qjson:${PORTSDIR}/devel/qjson \
fftw3:${PORTSDIR}/math/fftw3
+
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
# avoid clash with x11-wm/clementine
@@ -30,20 +30,24 @@ NO_STAGE= yes
USE_GL= glew
USE_QT4= dbus gui xml qmake_build uic_build moc_build rcc_build \
linguist_build network sql opengl qtestlib corelib webkit
-USE_GCC= 4.2+
+WITH_DEBUG= yes
INSTALLS_ICONS= yes
USE_GSTREAMER= gio ogg mp3 flac soup vorbis
MAKE_JOBS_UNSAFE= yes
CONFLICTS_BUILD= qt-3.*
CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
- -DENABLE_IMOBILEDEVICE=OFF
+ -DENABLE_IMOBILEDEVICE=OFF -DENABLE_SPARKLE=OFF \
+ -DENABLE_SOUNDMENU=OFF -DENABLE_DBUS=OFF -DENABLE_UBUNTU_ONE=OFF \
+ -DENABLE_DROPBOX=OFF -DENABLE_SKYDRIVE=OFF
OPTIONS_DEFINE= AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \
- LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV
+ LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV \
+ USE_BUILTIN_TAGLIB MOODBAR
AUDIOCD_DESC= Devices: Audio CD support
BREAKPAD_DESC= Crash reporting
+DBUS_DESC= Enable D-Bus support
DEVICEKIT_DESC= Devices: DeviceKit backend
GIO_DESC= Devices: GIO device backend
GOOGLE_DRIVE_DESC= Google Drive support
@@ -53,12 +57,32 @@ MTP_DESC= MTP device support
SPOTIFY_DESC= Support for Spotify service
VISUALISATION_DESC= Visualisations from projectM
WIIMOTEDEV_DESC= Wiimote support
+MOODBAR_DESC= Moodbar Support
+USE_BUILTIN_TAGLIB= Use Clementine builtin taglib support
-OPTIONS_DEFAULT= AUDIOCD DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP SPOTIFY \
- VISUALISATION WIIMOTEDEV
+OPTIONS_DEFAULT= AUDIOCD DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP \
+ VISUALISATION WIIMOTEDEV MOODBAR
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDBUS}
+CMAKE_ARGS+= -DENABLE_DBUS=ON
+.else
+CMAKE_ARGS+= -DENABLE_DBUS=OFF
+.endif
+
+.if ${PORT_OPTIONS:MMOODBAR}
+CMAKE_ARGS+= -DENABLE_MOODBAR=ON
+.else
+CMAKE_ARGS+= -DENABLE_MOODBAR=OFF
+.endif
+
+.if ${PORT_OPTIONS:MUSE_BUILTIN_TAGLIB}
+CMAKE_ARGS+= -DENABLE_USE_BUILTIN_TAGLIB=ON
+.else
+CMAKE_ARGS+= -DENABLE_USE_BUILTIN_TAGLIB=OFF
+.endif
+
.if ${PORT_OPTIONS:MAUDIOCD}
CMAKE_ARGS+= -DENABLE_AUDIOCD=ON
LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio
@@ -114,10 +138,10 @@ CMAKE_ARGS+= -DENABLE_LIBMTP=OFF
.endif
.if ${PORT_OPTIONS:MSPOTIFY}
-CMAKE_ARGS+= -DENABLE_SPOTIFY=ON
+CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=ON
LIB_DEPENDS+= qca:${PORTSDIR}/devel/qca
.else
-CMAKE_ARGS+= -DENABLE_SPOTIFY=OFF
+CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=OFF
.endif
.if ${PORT_OPTIONS:MVISUALISATION}
@@ -127,7 +151,8 @@ CMAKE_ARGS+= -DENABLE_VISUALISATIONS=OFF
.endif
.if ${PORT_OPTIONS:MWIIMOTEDEV}
-CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON
+CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON \
+ -DENABLE_DBUS=ON
.else
CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=OFF
.endif
@@ -1,2 +1,2 @@
-SHA256 (clementine-1.1.1.tar.gz) = a94dfbd4732155ff1d4f24bb792d9e4def5bf4a42dd6678638c0400217a6fda9
-SIZE (clementine-1.1.1.tar.gz) = 8557109
+SHA256 (clementine-1.2.0.tar.gz) = 563d00da4e893f7b1966ed137bcab28042151e31ea561cb7076047d3cad96f72
+MD5 (clementine-1.2.0.tar.gz) = 7dff2e11aedc2f1415ca0d4d79be71bf
@@ -0,0 +1,20 @@
+--- ./ext/libclementine-common/core/closure.cpp.orig 2013-11-24 15:58:51.321696435 -0800
++++ ./ext/libclementine-common/core/closure.cpp 2013-11-24 15:59:00.552695416 -0800
+@@ -33,7 +33,7 @@
+ CallbackClosure::CallbackClosure(
+ QObject* sender,
+ const char* signal,
+- std::tr1::function<void()> callback)
++ std::function<void()> callback)
+ : ClosureBase(new ObjectHelper(sender, signal, this)),
+ callback_(callback) {
+ }
+@@ -67,7 +67,7 @@
+ _detail::ClosureBase* NewClosure(
+ QObject* sender,
+ const char* signal,
+- std::tr1::function<void()> callback) {
++ std::function<void()> callback) {
+ return new _detail::CallbackClosure(
+ sender, signal, callback);
+ }
@@ -0,0 +1,42 @@
+--- ./ext/libclementine-common/core/closure.h.orig 2013-11-24 15:58:19.241698287 -0800
++++ ./ext/libclementine-common/core/closure.h 2013-11-24 15:58:38.634697259 -0800
+@@ -18,7 +18,7 @@
+ #ifndef CLOSURE_H
+ #define CLOSURE_H
+
+-#include <tr1/functional>
++#include <functional>
+
+ #include <QMetaMethod>
+ #include <QObject>
+@@ -158,12 +158,12 @@
+ CallbackClosure(
+ QObject* sender,
+ const char* signal,
+- std::tr1::function<void()> callback);
++ std::function<void()> callback);
+
+ virtual void Invoke();
+
+ private:
+- std::tr1::function<void()> callback_;
++ std::function<void()> callback_;
+ };
+
+ } // namespace _detail
+@@ -194,13 +194,13 @@
+ _detail::ClosureBase* NewClosure(
+ QObject* sender,
+ const char* signal,
+- std::tr1::function<void()> callback);
++ std::function<void()> callback);
+
+ template <typename... Args>
+ _detail::ClosureBase* NewClosure(
+ QObject* sender,
+ const char* signal,
+- std::tr1::function<void(Args...)> callback,
++ std::function<void(Args...)> callback,
+ const Args&... args) {
+ return NewClosure(sender, signal, boost::bind(callback, args...));
+ }
@@ -1,15 +0,0 @@
---- ext/clementine-tagreader/CMakeLists.txt.orig 2012-10-30 18:22:11.541849767 +0400
-+++ ext/clementine-tagreader/CMakeLists.txt 2012-10-30 18:28:28.037671443 +0400
-@@ -38,6 +38,12 @@
- libclementine-tagreader
- )
-
-+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ target_link_libraries(clementine-tagreader
-+ execinfo
-+ )
-+endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+
- if(APPLE)
- target_link_libraries(clementine-tagreader
- /System/Library/Frameworks/Foundation.framework
@@ -1,15 +0,0 @@
---- src/devices/cddadevice.h.orig 2012-01-11 22:39:56.000000000 -0600
-+++ src/devices/cddadevice.h 2012-01-11 22:40:33.000000000 -0600
-@@ -18,10 +18,10 @@
- #ifndef CDDADEVICE_H
- #define CDDADEVICE_H
-
--#include <cdio/cdio.h>
--#include <gst/cdda/gstcddabasesrc.h>
- #include <QMutex>
-
-+#include <cdio/cdio.h>
-+#include <gst/cdda/gstcddabasesrc.h>
- #include "connecteddevice.h"
- #include "core/song.h"
- #include "musicbrainz/musicbrainzclient.h"
@@ -1,16 +0,0 @@
---- src/devices/cddalister.cpp.orig 2012-01-11 22:39:03.000000000 -0600
-+++ src/devices/cddalister.cpp 2012-01-11 22:39:22.000000000 -0600
-@@ -15,12 +15,12 @@
- along with Clementine. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include <cdio/cdio.h>
- #include <QFileInfo>
- #include <QMutex>
- #include <QThread>
- #include <QWaitCondition>
-
-+#include <cdio/cdio.h>
- #include "cddalister.h"
- #include "core/logging.h"
- #include "core/song.h"
@@ -1,12 +0,0 @@
---- src/main.cpp.orig 2013-08-05 07:51:55.259557059 +0000
-+++ src/main.cpp 2013-08-05 08:02:30.142556079 +0000
-@@ -265,7 +265,9 @@
- #endif
-
- // This makes us show up nicely in gnome-volume-control
-+#if !GLIB_CHECK_VERSION(2, 36, 0)
- g_type_init();
-+#endif
- g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
-
- RegisterMetaTypes();
@@ -1,43 +1,10 @@
---- src/CMakeLists.txt.orig 2012-10-25 09:57:06.000000000 +0400
-+++ src/CMakeLists.txt 2012-10-31 17:12:22.608404870 +0400
-@@ -1192,15 +1192,23 @@
- endif (HAVE_SAC)
- endif (WIN32)
+--- src/CMakeLists.txt.orig 2013-10-20 17:40:58.416968707 +0000
++++ src/CMakeLists.txt 2013-10-20 17:41:24.671967496 +0000
+@@ -1322,6 +1322,7 @@
--if (LINUX)
-+if (LINUX AND NOT APPLE)
- # Hack: the Gold linker pays attention to the order that libraries are
- # specified on the link line. -lX11 and -ldl are provided earlier in the link
- # command but they're actually used by libraries that appear after them, so
- # they end up getting ignored. This appends them to the very end of the link
- # line, ensuring they're always used.
- find_package(X11)
-- target_link_libraries(clementine_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
--endif (LINUX)
-+ if (LINUX)
-+ target_link_libraries(clementine_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
-+ else (LINUX)
-+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ target_link_libraries(clementine_lib ${X11_X11_LIB})
-+ else (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ target_link_libraries(clementine_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
-+ endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ endif (LINUX)
-+endif (LINUX AND NOT APPLE)
+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ target_link_libraries(clementine execinfo)
++ set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- add_dependencies(clementine_lib qtsingleapplication)
-
-@@ -1227,6 +1235,13 @@
- ${CLEMENTINE-WIN32-RESOURCES}
- main.cpp
- )
-+if (UNIX AND NOT APPLE)
-+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ target_link_libraries(clementine execinfo)
-+ set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player)
-+ endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+endif (UNIX AND NOT APPLE)
-+
target_link_libraries(clementine
- clementine_lib
- )
@@ -0,0 +1,11 @@
+--- ./src/playlistparsers/plsparser.cpp.orig 2013-11-24 16:01:13.247686715 -0800
++++ ./src/playlistparsers/plsparser.cpp 2013-11-24 16:03:24.812677689 -0800
+@@ -46,7 +46,7 @@
+ // Use the title and length we've already loaded if any
+ if (!songs[n].title().isEmpty())
+ song.set_title(songs[n].title());
+- if (!songs[n].length_nanosec() != -1)
++ if (songs[n].length_nanosec() != -1)
+ song.set_length_nanosec(songs[n].length_nanosec());
+
+ songs[n] = song;
@@ -0,0 +1,11 @@
+--- ./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;
+
@@ -1,27 +0,0 @@
---- src/core/utilities.cpp.orig 2012-10-30 17:49:07.162325275 +0400
-+++ src/core/utilities.cpp 2012-10-30 17:50:58.101950562 +0400
-@@ -520,13 +520,9 @@ bool IsLaptop() {
- }
-
- return !(status.BatteryFlag & 128); // 128 = no system battery
--#endif
--
--#ifdef Q_OS_LINUX
-+#elif Q_OS_LINUX
- return !QDir("/proc/acpi/battery").entryList(QDir::Dirs | QDir::NoDotAndDotDot).isEmpty();
--#endif
--
--#ifdef Q_OS_MAC
-+#elif Q_OS_MAC
- ScopedCFTypeRef<CFTypeRef> power_sources(IOPSCopyPowerSourcesInfo());
- ScopedCFTypeRef<CFArrayRef> power_source_list(
- IOPSCopyPowerSourcesList(power_sources.get()));
-@@ -540,6 +536,8 @@ bool IsLaptop() {
- }
- }
- return false;
-+#else
-+ return false;
- #endif
- }
-
Oops, something went wrong.

0 comments on commit d22838d

Please sign in to comment.