audio/clementine-player
- The upstream hasn't done a full "release" in quite a few years. There is plenty of commit activity and development however. Switch to just using their github tree directly at a "stable" release. - Remove a few patches that have been accepted upstream or deprecated. - Explicitly use libimobiledevice when GPOD is selected. - Explicitly USE_GL= gl glue - Explicitly USE_XORG=x11 I've been using this version on my desktop for a week now with no errors noted. Lightly reviewed by mat@ Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D15544
This commit is contained in:
parent
cb6bd09906
commit
cd2733178a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470986
4 changed files with 10 additions and 51 deletions
|
@ -2,8 +2,9 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= clementine
|
PORTNAME= clementine
|
||||||
PORTVERSION= 1.3.1
|
DISTVERSIONPREFIX= v
|
||||||
PORTREVISION= 21
|
DISTVERSION= 1.3.1-441
|
||||||
|
DISTVERSIONSUFFIX= -gc01b7bc
|
||||||
CATEGORIES= audio
|
CATEGORIES= audio
|
||||||
PKGNAMESUFFIX= -player
|
PKGNAMESUFFIX= -player
|
||||||
|
|
||||||
|
@ -36,7 +37,8 @@ USES= cmake \
|
||||||
pkgconfig \
|
pkgconfig \
|
||||||
sqlite
|
sqlite
|
||||||
|
|
||||||
USE_GL= glew
|
USE_GL= gl glew glu
|
||||||
|
USE_XORG= x11
|
||||||
|
|
||||||
CONFLICTS_BUILD= qt-3.*
|
CONFLICTS_BUILD= qt-3.*
|
||||||
USE_QT4= corelib \
|
USE_QT4= corelib \
|
||||||
|
@ -170,7 +172,8 @@ 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 \
|
libplist.so:devel/libplist \
|
||||||
libusbmuxd.so:comms/libusbmuxd
|
libusbmuxd.so:comms/libusbmuxd \
|
||||||
|
libimobiledevice.so:comms/libimobiledevice
|
||||||
GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON
|
GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON
|
||||||
GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF
|
GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
SHA256 (clementine-player-Clementine-1.3.1_GH0.tar.gz) = f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
|
TIMESTAMP = 1527263085
|
||||||
SIZE (clementine-player-Clementine-1.3.1_GH0.tar.gz) = 8501827
|
SHA256 (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 78082a523dc21b6ddf17fd7bd3ab7734634bce93dacdc1a50efb4dda4e346be6
|
||||||
|
SIZE (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 8468459
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
Add compatibility with chromaprint >= 1.4
|
|
||||||
|
|
||||||
diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
|
|
||||||
index 9579b62..c7ad99e 100644
|
|
||||||
--- src/musicbrainz/chromaprinter.cpp.orig
|
|
||||||
+++ src/musicbrainz/chromaprinter.cpp
|
|
||||||
@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
|
|
||||||
ChromaprintContext* chromaprint =
|
|
||||||
chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
|
|
||||||
chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
|
|
||||||
- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
|
|
||||||
+ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
|
|
||||||
data.size() / 2);
|
|
||||||
chromaprint_finish(chromaprint);
|
|
||||||
|
|
||||||
- void* fprint = nullptr;
|
|
||||||
int size = 0;
|
|
||||||
+
|
|
||||||
+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
|
|
||||||
+ u_int32_t *fprint = nullptr;
|
|
||||||
+ char *encoded = nullptr;
|
|
||||||
+#else
|
|
||||||
+ void *fprint = nullptr;
|
|
||||||
+ void *encoded = nullptr;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
|
|
||||||
+
|
|
||||||
QByteArray fingerprint;
|
|
||||||
if (ret == 1) {
|
|
||||||
- void* encoded = nullptr;
|
|
||||||
int encoded_size = 0;
|
|
||||||
chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
|
|
||||||
&encoded, &encoded_size, 1);
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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"
|
|
||||||
|
|
Loading…
Reference in a new issue